From: Greg Kroah-Hartman Date: Wed, 17 Jul 2024 06:20:47 +0000 (+0200) Subject: drop queue-4.19/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch X-Git-Tag: v4.19.318~11 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d83fc207e9820b7cd3a9bdbafeee1840ce9d1129;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-4.19/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch --- diff --git a/queue-4.19/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch b/queue-4.19/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch deleted file mode 100644 index 5745dad9163..00000000000 --- a/queue-4.19/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch +++ /dev/null @@ -1,47 +0,0 @@ -From ebae77ad122f2785aa21f9f30af4989b7d5a96d9 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 30 Apr 2024 16:30:01 +0200 -Subject: s390: Mark psw in __load_psw_mask() as __unitialized - -From: Sven Schnelle - -[ Upstream commit 7278a8fb8d032dfdc03d9b5d17e0bc451cdc1492 ] - -Without __unitialized, the following code is generated when -INIT_STACK_ALL_ZERO is enabled: - -86: d7 0f f0 a0 f0 a0 xc 160(16,%r15), 160(%r15) -8c: e3 40 f0 a0 00 24 stg %r4, 160(%r15) -92: c0 10 00 00 00 08 larl %r1, 0xa2 -98: e3 10 f0 a8 00 24 stg %r1, 168(%r15) -9e: b2 b2 f0 a0 lpswe 160(%r15) - -The xc is not adding any security because psw is fully initialized -with the following instructions. Add __unitialized to the psw -definitiation to avoid the superfluous clearing of psw. - -Reviewed-by: Heiko Carstens -Signed-off-by: Sven Schnelle -Signed-off-by: Alexander Gordeev -Signed-off-by: Sasha Levin ---- - arch/s390/include/asm/processor.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h -index 7f2953c15c37b..93ba3befd6d40 100644 ---- a/arch/s390/include/asm/processor.h -+++ b/arch/s390/include/asm/processor.h -@@ -289,8 +289,8 @@ static inline void __load_psw(psw_t psw) - */ - static inline void __load_psw_mask(unsigned long mask) - { -+ psw_t psw __uninitialized; - unsigned long addr; -- psw_t psw; - - psw.mask = mask; - --- -2.43.0 - diff --git a/queue-4.19/series b/queue-4.19/series index bc82cfab674..ad47275d841 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -44,7 +44,6 @@ tcp-fix-incorrect-undo-caused-by-dsack-of-tlp-retran.patch net-lantiq_etop-add-blank-line-after-declaration.patch net-ethernet-lantiq_etop-fix-double-free-in-detach.patch ppp-reject-claimed-as-lcp-but-actually-malformed-pac.patch -s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch arm-davinci-convert-comma-to-semicolon.patch usb-serial-option-add-telit-generic-core-dump-composition.patch usb-serial-option-add-telit-fn912-rmnet-compositions.patch