From 928bcef3536049ef1f54fbf7800da286f36cd94f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 11 Jul 2024 11:51:50 +0200 Subject: [PATCH] drop s390 patch from all but 6.9 --- ...-in-__load_psw_mask-as-__unitialized.patch | 47 ------------------- queue-4.19/series | 1 - ...-in-__load_psw_mask-as-__unitialized.patch | 47 ------------------- queue-5.10/series | 1 - ...-in-__load_psw_mask-as-__unitialized.patch | 47 ------------------- queue-5.15/series | 1 - ...-in-__load_psw_mask-as-__unitialized.patch | 47 ------------------- queue-5.4/series | 1 - ...-in-__load_psw_mask-as-__unitialized.patch | 47 ------------------- queue-6.1/series | 1 - ...-in-__load_psw_mask-as-__unitialized.patch | 47 ------------------- queue-6.6/series | 1 - 12 files changed, 288 deletions(-) delete mode 100644 queue-4.19/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch delete mode 100644 queue-5.10/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch delete mode 100644 queue-5.15/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch delete mode 100644 queue-5.4/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch delete mode 100644 queue-6.1/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch delete mode 100644 queue-6.6/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 060a4d5a712..00000000000 --- a/queue-4.19/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4e8d90bbb8c28a64bb98bbc3322970054c0bc71f 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 ad5d003f98f..e77d45babe9 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -15,7 +15,6 @@ powerpc-64-set-_io_base-to-poison_pointer_delta-not-.patch orangefs-fix-out-of-bounds-fsid-access.patch powerpc-xmon-check-cpu-id-in-commands-c-dp-and-dx.patch jffs2-fix-potential-illegal-address-access-in-jffs2_.patch -s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch s390-pkey-wipe-sensitive-data-on-failure.patch tcp-take-care-of-compressed-acks-in-tcp_add_reno_sac.patch tcp-tcp_mark_head_lost-is-only-valid-for-sack-tcp.patch diff --git a/queue-5.10/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch b/queue-5.10/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch deleted file mode 100644 index 39f476eac4a..00000000000 --- a/queue-5.10/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 81a6884791b2aceee9f6db6f10242e0bd4f0e292 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 0987c3fc45f58..95ed01a3536c6 100644 ---- a/arch/s390/include/asm/processor.h -+++ b/arch/s390/include/asm/processor.h -@@ -252,8 +252,8 @@ static inline void __load_psw(psw_t psw) - */ - static __always_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-5.10/series b/queue-5.10/series index 71be383944b..84cd03d4ba3 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -24,7 +24,6 @@ kunit-fix-timeout-message.patch powerpc-xmon-check-cpu-id-in-commands-c-dp-and-dx.patch bpf-avoid-uninitialized-value-in-bpf_core_read_bitfi.patch jffs2-fix-potential-illegal-address-access-in-jffs2_.patch -s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch s390-pkey-wipe-sensitive-data-on-failure.patch upstream-tcp-fix-dsack-undo-in-fast-recovery-to-call.patch tcp_metrics-validate-source-addr-length.patch diff --git a/queue-5.15/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch b/queue-5.15/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch deleted file mode 100644 index ee6182b65cb..00000000000 --- a/queue-5.15/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f7d4cb21b0cee2de9265c3a910f7f61f3dc93bdb 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 d7ca76bb2720f..2ba16e67c96d5 100644 ---- a/arch/s390/include/asm/processor.h -+++ b/arch/s390/include/asm/processor.h -@@ -250,8 +250,8 @@ static inline void __load_psw(psw_t psw) - */ - static __always_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-5.15/series b/queue-5.15/series index ca16a200b1d..93a040fe5e6 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -27,7 +27,6 @@ powerpc-xmon-check-cpu-id-in-commands-c-dp-and-dx.patch igc-fix-a-log-entry-using-uninitialized-netdev.patch bpf-avoid-uninitialized-value-in-bpf_core_read_bitfi.patch jffs2-fix-potential-illegal-address-access-in-jffs2_.patch -s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch s390-pkey-wipe-sensitive-data-on-failure.patch tools-power-turbostat-remember-global-max_die_id.patch upstream-tcp-fix-dsack-undo-in-fast-recovery-to-call.patch diff --git a/queue-5.4/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch b/queue-5.4/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch deleted file mode 100644 index 391c0c49d01..00000000000 --- a/queue-5.4/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch +++ /dev/null @@ -1,47 +0,0 @@ -From c7d1c9caf8204b2224f8f1cabd14f651acc349e2 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 48d6ccdef5f77..00bb2d287f740 100644 ---- a/arch/s390/include/asm/processor.h -+++ b/arch/s390/include/asm/processor.h -@@ -256,8 +256,8 @@ static inline void __load_psw(psw_t psw) - */ - static __always_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-5.4/series b/queue-5.4/series index e1aa1fa2936..260945711ba 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -18,7 +18,6 @@ powerpc-64-set-_io_base-to-poison_pointer_delta-not-.patch orangefs-fix-out-of-bounds-fsid-access.patch powerpc-xmon-check-cpu-id-in-commands-c-dp-and-dx.patch jffs2-fix-potential-illegal-address-access-in-jffs2_.patch -s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch s390-pkey-wipe-sensitive-data-on-failure.patch tcp-tcp_mark_head_lost-is-only-valid-for-sack-tcp.patch tcp-add-ece_ack-flag-to-reno-sack-functions.patch diff --git a/queue-6.1/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch b/queue-6.1/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch deleted file mode 100644 index 065fd41a771..00000000000 --- a/queue-6.1/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 2798f70f8a25a0f85b182c2d2ab9a66d035c8f2a 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 c907f747d2a04..26861b09293f1 100644 ---- a/arch/s390/include/asm/processor.h -+++ b/arch/s390/include/asm/processor.h -@@ -250,8 +250,8 @@ static inline void __load_psw(psw_t psw) - */ - static __always_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-6.1/series b/queue-6.1/series index f073518c657..09434fa3428 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -34,7 +34,6 @@ f2fs-check-validation-of-fault-attrs-in-f2fs_build_f.patch scsi-mpi3mr-sanitise-num_phys.patch serial-imx-raise-tx-trigger-level-to-8.patch jffs2-fix-potential-illegal-address-access-in-jffs2_.patch -s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch s390-pkey-wipe-sensitive-data-on-failure.patch btrfs-scrub-initialize-ret-in-scrub_simple_mirror-to.patch cdrom-rearrange-last_media_change-check-to-avoid-uni.patch diff --git a/queue-6.6/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch b/queue-6.6/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch deleted file mode 100644 index 712892d6baf..00000000000 --- a/queue-6.6/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 33f1611303b098b8b8c53ef0ca8b458126fbccbe 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 dc17896a001a9..e7338ed540d8f 100644 ---- a/arch/s390/include/asm/processor.h -+++ b/arch/s390/include/asm/processor.h -@@ -308,8 +308,8 @@ static inline void __load_psw(psw_t psw) - */ - static __always_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-6.6/series b/queue-6.6/series index 492f1129f37..d5261a28234 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -47,7 +47,6 @@ f2fs-check-validation-of-fault-attrs-in-f2fs_build_f.patch scsi-mpi3mr-sanitise-num_phys.patch serial-imx-raise-tx-trigger-level-to-8.patch jffs2-fix-potential-illegal-address-access-in-jffs2_.patch -s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch s390-pkey-wipe-sensitive-data-on-failure.patch btrfs-scrub-initialize-ret-in-scrub_simple_mirror-to.patch cdrom-rearrange-last_media_change-check-to-avoid-uni.patch -- 2.47.3