tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 's390-7.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 fixes from Alexander Gordeev:

- Reject zero-length writes from userspace that corrupt Debug Facility
buffers

- Replace one s390 PCI maintainer

- Remove SCLP_OFB Kconfig option and enable the guarded code
unconditionally

- Replace incorrect use of phys_to_folio() to virt_to_folio() in
do_secure_storage_access()

* tag 's390-7.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/mm: Fix phys_to_folio() usage in do_secure_storage_access()
s390/sclp: Remove SCLP_OFB Kconfig option
MAINTAINERS: Replace one of the maintainers for s390/pci
s390/debug: Reject zero-length input in debug_input_flush_fn()
s390/debug: Reject zero-length input before trimming a newline

Linus Torvalds bb1d73f2 227c3d54

+10 -16
+1 -1
MAINTAINERS
··· 23555 23555 23556 23556 S390 PCI SUBSYSTEM 23557 23557 M: Niklas Schnelle <schnelle@linux.ibm.com> 23558 - M: Gerald Schaefer <gerald.schaefer@linux.ibm.com> 23558 + M: Gerd Bayer <gbayer@linux.ibm.com> 23559 23559 L: linux-s390@vger.kernel.org 23560 23560 S: Supported 23561 23561 F: Documentation/arch/s390/pci.rst
+8
arch/s390/kernel/debug.c
··· 1414 1414 { 1415 1415 char *buffer; 1416 1416 1417 + if (!user_len) 1418 + return ERR_PTR(-EINVAL); 1419 + 1417 1420 buffer = memdup_user_nul(user_buf, user_len); 1418 1421 if (IS_ERR(buffer)) 1419 1422 return buffer; ··· 1586 1583 { 1587 1584 char input_buf[1]; 1588 1585 int rc = user_len; 1586 + 1587 + if (!user_len) { 1588 + rc = -EINVAL; 1589 + goto out; 1590 + } 1589 1591 1590 1592 if (user_len > 0x10000) 1591 1593 user_len = 0x10000;
+1 -1
arch/s390/mm/fault.c
··· 438 438 panic("Unexpected PGM 0x3d with TEID bit 61=0"); 439 439 } 440 440 if (is_kernel_fault(regs)) { 441 - folio = phys_to_folio(addr); 441 + folio = virt_to_folio((void *)addr); 442 442 if (unlikely(!folio_try_get(folio))) 443 443 return; 444 444 rc = uv_convert_from_secure(folio_to_phys(folio));
-8
drivers/s390/char/Kconfig
··· 85 85 transfer cache size from its default value 0.5MB to N bytes. If N 86 86 is zero, then no caching is performed. 87 87 88 - config SCLP_OFB 89 - def_bool n 90 - prompt "Support for Open-for-Business SCLP Event" 91 - depends on S390 92 - help 93 - This option enables the Open-for-Business interface to the s390 94 - Service Element. 95 - 96 88 config S390_UV_UAPI 97 89 def_tristate m 98 90 prompt "Ultravisor userspace API"
-6
drivers/s390/char/sclp_config.c
··· 80 80 81 81 static struct sclp_register sclp_conf_register = 82 82 { 83 - #ifdef CONFIG_SCLP_OFB 84 83 .send_mask = EVTYP_CONFMGMDATA_MASK, 85 - #endif 86 84 .receive_mask = EVTYP_CONFMGMDATA_MASK, 87 85 .receiver_fn = sclp_conf_receiver_fn, 88 86 }; 89 87 90 - #ifdef CONFIG_SCLP_OFB 91 88 static int sclp_ofb_send_req(char *ev_data, size_t len) 92 89 { 93 90 static DEFINE_MUTEX(send_mutex); ··· 140 143 }, 141 144 .write = sysfs_ofb_data_write, 142 145 }; 143 - #endif 144 146 145 147 static int __init sclp_ofb_setup(void) 146 148 { 147 - #ifdef CONFIG_SCLP_OFB 148 149 struct kset *ofb_kset; 149 150 int rc; 150 151 ··· 154 159 kset_unregister(ofb_kset); 155 160 return rc; 156 161 } 157 - #endif 158 162 return 0; 159 163 } 160 164