Messages in this thread Patch in this message | | | Date | Fri, 25 Nov 2022 17:17:09 +0100 | From | Alexander Gordeev <> | Subject | [GIT PULL] s390 updates for 6.1-rc7 |
| |
Hello Linus,
please pull s390 changes for 6.1-rc7.
Thank you, Alexander
The following changes since commit e3c11025bcd2142a61abe5806b2f86a0e78118df:
s390: avoid using global register for current_stack_pointer (2022-11-04 12:06:47 +0100)
are available in the Git repository at e3c11025bcd2142a61abe5806b2f86a0e78118df:
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-6.1-6
for you to fetch changes up to adba1a9b81d5020a9bf8332fee9ff0171fe7623d:
MAINTAINERS: add S390 MM section (2022-11-17 20:23:30 +0100)
---------------------------------------------------------------- s390 updates for 6.1-rc7
- Fix size of incorrectly increased from four to eight bytes TOD field of crash dump save area. As result in case of kdump NT_S390_TODPREG ELF notes section contains correct value and "detected read beyond size of field" compiler warning goes away.
- Fix memory leak in cryptographic Adjunct Processors (AP) module on initialization failure path.
- Add Gerald Schaefer <gerald.schaefer@linux.ibm.com> and Alexander Gordeev <agordeev@linux.ibm.com> as S390 memory management maintainers. Also rename the S390 section to S390 ARCHITECTURE to be a bit more precise.
---------------------------------------------------------------- Heiko Carstens (2): s390/crashdump: fix TOD programmable field size MAINTAINERS: add S390 MM section
Wei Yongjun (1): s390/ap: fix memory leak in ap_init_qci_info()
MAINTAINERS | 11 ++++++++++- arch/s390/kernel/crash_dump.c | 2 +- drivers/s390/crypto/ap_bus.c | 5 ++++- 3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS index ea5fcf9047ea..c4f6d3490d13 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17987,7 +17987,7 @@ L: linux-fbdev@vger.kernel.org S: Maintained F: drivers/video/fbdev/savage/ -S390 +S390 ARCHITECTURE M: Heiko Carstens <hca@linux.ibm.com> M: Vasily Gorbik <gor@linux.ibm.com> M: Alexander Gordeev <agordeev@linux.ibm.com> @@ -18042,6 +18042,15 @@ L: netdev@vger.kernel.org S: Supported F: drivers/s390/net/ +S390 MM +M: Alexander Gordeev <agordeev@linux.ibm.com> +M: Gerald Schaefer <gerald.schaefer@linux.ibm.com> +L: linux-s390@vger.kernel.org +S: Supported +T: git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git +F: arch/s390/include/asm/pgtable.h +F: arch/s390/mm + S390 PCI SUBSYSTEM M: Niklas Schnelle <schnelle@linux.ibm.com> M: Gerald Schaefer <gerald.schaefer@linux.ibm.com> diff --git a/arch/s390/kernel/crash_dump.c b/arch/s390/kernel/crash_dump.c index dd74fe664ed1..e4ef67e4da0a 100644 --- a/arch/s390/kernel/crash_dump.c +++ b/arch/s390/kernel/crash_dump.c @@ -46,7 +46,7 @@ struct save_area { u64 fprs[16]; u32 fpc; u32 prefix; - u64 todpreg; + u32 todpreg; u64 timer; u64 todcmp; u64 vxrs_low[16]; diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c index 59ac98f2bd27..b02c631f3b71 100644 --- a/drivers/s390/crypto/ap_bus.c +++ b/drivers/s390/crypto/ap_bus.c @@ -233,8 +233,11 @@ static void __init ap_init_qci_info(void) if (!ap_qci_info) return; ap_qci_info_old = kzalloc(sizeof(*ap_qci_info_old), GFP_KERNEL); - if (!ap_qci_info_old) + if (!ap_qci_info_old) { + kfree(ap_qci_info); + ap_qci_info = NULL; return; + } if (ap_fetch_qci_info(ap_qci_info) != 0) { kfree(ap_qci_info); kfree(ap_qci_info_old);
| |