projects/linux·commit e3ebac80

Merge tag 's390-6.1-6' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

e3ebac80 · Linus Torvalds <[email protected]> · 2022-11-25 12:37:24 -08:00

Pull s390 updates from Alexander Gordeev:

 - 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 <[email protected]> and Alexander
   Gordeev <[email protected]> as S390 memory management
   maintainers. Also rename the S390 section to S390 ARCHITECTURE to be
   a bit more precise.

* tag 's390-6.1-6' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  MAINTAINERS: add S390 MM section
  s390/crashdump: fix TOD programmable field size
  s390/ap: fix memory leak in ap_init_qci_info()
Commit
e3ebac80b6e9efe47b0ac3bf4b2d800b0b1958ff
Parents
081f359e · adba1a9b

Merge commit. Changes below are compared with the first parent: 081f359e.

Changes

3 files changed · +15 −3

FileStatusAddDelContent
MAINTAINERSmodified+10−1View file
arch/s390/kernel/crash_dump.cmodified+1−1View file
drivers/s390/crypto/ap_bus.cmodified+4−1View file

MAINTAINERS

View file
diff --git a/MAINTAINERS b/MAINTAINERS
index a1afc62..69565ac 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -18011,7 +18011,7 @@ L: [email protected]
S: Maintained
F: drivers/video/fbdev/savage/
-S390
+S390 ARCHITECTURE
M: Heiko Carstens <[email protected]>
M: Vasily Gorbik <[email protected]>
M: Alexander Gordeev <[email protected]>
@@ -18066,6 +18066,15 @@ L: [email protected]
S: Supported
F: drivers/s390/net/
+S390 MM
+M: Alexander Gordeev <[email protected]>
+M: Gerald Schaefer <[email protected]>
+L: [email protected]
+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 <[email protected]>
M: Gerald Schaefer <[email protected]>

arch/s390/kernel/crash_dump.c

View file
diff --git a/arch/s390/kernel/crash_dump.c b/arch/s390/kernel/crash_dump.c
index dd74fe6..e4ef67e 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];

drivers/s390/crypto/ap_bus.c

View file
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index 59ac98f..b02c631 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);