diff for duplicates of <t@ub.hpns> diff --git a/a/1.txt b/N1/1.txt index 651fd73..9768b12 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,17 +1,20 @@ -On Tue, Jun 30, 2026 at 07:32:14PM +0200, Gerald Schaefer wrote: -> Commit 86f48f922ba79 ("s390/mmap: disable mmap alignment when -> randomize_va_space = 0") introduced get_align_mask() with return type of -> 'int', while the target field 'info.align_mask' in struct -> vm_unmapped_area_info is 'unsigned long'. +On Fri, Jun 26, 2026 at 01:58:20PM +0800, Rongguang Wei wrote: +> From: Rongguang Wei <weirongguang@kylinos.cn> > -> With currently used masks, this should not cause truncation issues, but -> fix it and return 'unsigned long' to avoid future problems. +> The files has no real user because CEX2 and CEX3 device drivers +> are removed, also remove these empty files. > -> Fixes: 86f48f922ba79 ("s390/mmap: disable mmap alignment when randomize_va_space = 0") -> Cc: stable@vger.kernel.org # v6.9+ -> Signed-off-by: Gerald Schaefer <gerald.schaefer@linux.ibm.com> +> Fixes: 5ac8c72462cd ("s390/zcrypt: remove CEX2 and CEX3 device drivers") +> Signed-off-by: Rongguang Wei <weirongguang@kylinos.cn> > --- -> arch/s390/mm/mmap.c | 2 +- -> 1 file changed, 1 insertion(+), 1 deletion(-) +> drivers/s390/crypto/zcrypt_cex2a.c | 0 +> drivers/s390/crypto/zcrypt_cex2a.h | 0 +> drivers/s390/crypto/zcrypt_cex2c.c | 0 +> drivers/s390/crypto/zcrypt_cex2c.h | 0 +> 4 files changed, 0 insertions(+), 0 deletions(-) +> delete mode 100644 drivers/s390/crypto/zcrypt_cex2a.c +> delete mode 100644 drivers/s390/crypto/zcrypt_cex2a.h +> delete mode 100644 drivers/s390/crypto/zcrypt_cex2c.c +> delete mode 100644 drivers/s390/crypto/zcrypt_cex2c.h Applied, thank you! diff --git a/a/content_digest b/N1/content_digest index a7841b4..bfcf38e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,29 +1,35 @@ - "ref\020260630173214.3114408-1-gerald.schaefer@linux.ibm.com\0" + "ref\020260626055820.376212-1-clementwei90@163.com\0" "From\0Vasily Gorbik <gor@linux.ibm.com>\0" - "Subject\0Re: [PATCH] s390/mm: Fix type mismatch in get_align_mask().\0" - "Date\0Fri, 3 Jul 2026 11:47:16 +0200\0" - "To\0Gerald Schaefer <gerald.schaefer@linux.ibm.com>\0" - "Cc\0linux-s390 <linux-s390@vger.kernel.org>" - Sven Schnelle <svens@linux.ibm.com> - " Alexander Gordeev <agordeev@linux.ibm.com>\0" + "Subject\0Re: [PATCH v1] s390/zcrypt: Remove the empty file\0" + "Date\0Fri, 3 Jul 2026 11:58:16 +0200\0" + "To\0Rongguang Wei <clementwei90@163.com>\0" + "Cc\0linux-s390@vger.kernel.org" + freude@linux.ibm.com + hca@linux.ibm.com + dengler@linux.ibm.com + svens@linux.ibm.com + " Rongguang Wei <weirongguang@kylinos.cn>\0" "\00:1\0" "b\0" - "On Tue, Jun 30, 2026 at 07:32:14PM +0200, Gerald Schaefer wrote:\n" - "> Commit 86f48f922ba79 (\"s390/mmap: disable mmap alignment when\n" - "> randomize_va_space = 0\") introduced get_align_mask() with return type of\n" - "> 'int', while the target field 'info.align_mask' in struct\n" - "> vm_unmapped_area_info is 'unsigned long'.\n" + "On Fri, Jun 26, 2026 at 01:58:20PM +0800, Rongguang Wei wrote:\n" + "> From: Rongguang Wei <weirongguang@kylinos.cn>\n" "> \n" - "> With currently used masks, this should not cause truncation issues, but\n" - "> fix it and return 'unsigned long' to avoid future problems.\n" + "> The files has no real user because CEX2 and CEX3 device drivers\n" + "> are removed, also remove these empty files.\n" "> \n" - "> Fixes: 86f48f922ba79 (\"s390/mmap: disable mmap alignment when randomize_va_space = 0\")\n" - "> Cc: stable@vger.kernel.org # v6.9+\n" - "> Signed-off-by: Gerald Schaefer <gerald.schaefer@linux.ibm.com>\n" + "> Fixes: 5ac8c72462cd (\"s390/zcrypt: remove CEX2 and CEX3 device drivers\")\n" + "> Signed-off-by: Rongguang Wei <weirongguang@kylinos.cn>\n" "> ---\n" - "> arch/s390/mm/mmap.c | 2 +-\n" - "> 1 file changed, 1 insertion(+), 1 deletion(-)\n" + "> drivers/s390/crypto/zcrypt_cex2a.c | 0\n" + "> drivers/s390/crypto/zcrypt_cex2a.h | 0\n" + "> drivers/s390/crypto/zcrypt_cex2c.c | 0\n" + "> drivers/s390/crypto/zcrypt_cex2c.h | 0\n" + "> 4 files changed, 0 insertions(+), 0 deletions(-)\n" + "> delete mode 100644 drivers/s390/crypto/zcrypt_cex2a.c\n" + "> delete mode 100644 drivers/s390/crypto/zcrypt_cex2a.h\n" + "> delete mode 100644 drivers/s390/crypto/zcrypt_cex2c.c\n" + "> delete mode 100644 drivers/s390/crypto/zcrypt_cex2c.h\n" "\n" Applied, thank you! -bc04910c153923b47bb208fe6b76d68b51e48705208d49d89f6560608c9b8f60 +6c58bb17fd4828e6f46728d6d28576382077dc0754a639adf68a2705f5c948f3
diff --git a/a/1.txt b/N2/1.txt index 651fd73..a5a9d83 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,17 +1,39 @@ -On Tue, Jun 30, 2026 at 07:32:14PM +0200, Gerald Schaefer wrote: -> Commit 86f48f922ba79 ("s390/mmap: disable mmap alignment when -> randomize_va_space = 0") introduced get_align_mask() with return type of -> 'int', while the target field 'info.align_mask' in struct -> vm_unmapped_area_info is 'unsigned long'. -> -> With currently used masks, this should not cause truncation issues, but -> fix it and return 'unsigned long' to avoid future problems. -> -> Fixes: 86f48f922ba79 ("s390/mmap: disable mmap alignment when randomize_va_space = 0") -> Cc: stable@vger.kernel.org # v6.9+ -> Signed-off-by: Gerald Schaefer <gerald.schaefer@linux.ibm.com> -> --- -> arch/s390/mm/mmap.c | 2 +- -> 1 file changed, 1 insertion(+), 1 deletion(-) - -Applied, thank you! +Hello Linus, + +please pull s390 fixes for 7.2-rc2. + +Thank you, +Vasily + +The following changes since commit dc59e4fea9d83f03bad6bddf3fa2e52491777482: + + Linux 7.2-rc1 (2026-06-28 12:01:31 -0700) + +are available in the Git repository at: + + git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-7.2-3 + +for you to fetch changes up to 2995ccec260caa9e85b3301a4aba1e66ed80ad74: + + s390/monwriter: Reject buffer reuse with different data length (2026-07-02 16:51:06 +0200) + +---------------------------------------------------------------- +s390 updates for 7.2-rc2 + +- Fix PKEY_VERIFYPROTK ioctl key type handling by removing the generic + key-length based type check with its wrong bit-size calculation, + and leaving protected key verification to the pkey handler + +- Fix monwriter buffer reuse by rejecting records that change the data + length, preventing out of bounds user copy into the kernel buffer + +---------------------------------------------------------------- +Gerald Schaefer (1): + s390/monwriter: Reject buffer reuse with different data length + +Holger Dengler (1): + pkey: Move keytype check from pkey api to handler + + drivers/s390/char/monwriter.c | 3 +++ + drivers/s390/crypto/pkey_api.c | 11 +---------- + 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/a/content_digest b/N2/content_digest index a7841b4..579018e 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,29 +1,51 @@ - "ref\020260630173214.3114408-1-gerald.schaefer@linux.ibm.com\0" "From\0Vasily Gorbik <gor@linux.ibm.com>\0" - "Subject\0Re: [PATCH] s390/mm: Fix type mismatch in get_align_mask().\0" - "Date\0Fri, 3 Jul 2026 11:47:16 +0200\0" - "To\0Gerald Schaefer <gerald.schaefer@linux.ibm.com>\0" - "Cc\0linux-s390 <linux-s390@vger.kernel.org>" - Sven Schnelle <svens@linux.ibm.com> - " Alexander Gordeev <agordeev@linux.ibm.com>\0" + "Subject\0[GIT PULL] s390 updates for 7.2-rc2\0" + "Date\0Sat, 4 Jul 2026 18:27:54 +0200\0" + "To\0Linus Torvalds <torvalds@linux-foundation.org>\0" + "Cc\0Heiko Carstens <hca@linux.ibm.com>" + Alexander Gordeev <agordeev@linux.ibm.com> + linux-kernel@vger.kernel.org + " linux-s390@vger.kernel.org\0" "\00:1\0" "b\0" - "On Tue, Jun 30, 2026 at 07:32:14PM +0200, Gerald Schaefer wrote:\n" - "> Commit 86f48f922ba79 (\"s390/mmap: disable mmap alignment when\n" - "> randomize_va_space = 0\") introduced get_align_mask() with return type of\n" - "> 'int', while the target field 'info.align_mask' in struct\n" - "> vm_unmapped_area_info is 'unsigned long'.\n" - "> \n" - "> With currently used masks, this should not cause truncation issues, but\n" - "> fix it and return 'unsigned long' to avoid future problems.\n" - "> \n" - "> Fixes: 86f48f922ba79 (\"s390/mmap: disable mmap alignment when randomize_va_space = 0\")\n" - "> Cc: stable@vger.kernel.org # v6.9+\n" - "> Signed-off-by: Gerald Schaefer <gerald.schaefer@linux.ibm.com>\n" - "> ---\n" - "> arch/s390/mm/mmap.c | 2 +-\n" - "> 1 file changed, 1 insertion(+), 1 deletion(-)\n" - "\n" - Applied, thank you! + "Hello Linus,\n" + "\n" + "please pull s390 fixes for 7.2-rc2.\n" + "\n" + "Thank you,\n" + "Vasily\n" + "\n" + "The following changes since commit dc59e4fea9d83f03bad6bddf3fa2e52491777482:\n" + "\n" + " Linux 7.2-rc1 (2026-06-28 12:01:31 -0700)\n" + "\n" + "are available in the Git repository at:\n" + "\n" + " git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-7.2-3\n" + "\n" + "for you to fetch changes up to 2995ccec260caa9e85b3301a4aba1e66ed80ad74:\n" + "\n" + " s390/monwriter: Reject buffer reuse with different data length (2026-07-02 16:51:06 +0200)\n" + "\n" + "----------------------------------------------------------------\n" + "s390 updates for 7.2-rc2\n" + "\n" + "- Fix PKEY_VERIFYPROTK ioctl key type handling by removing the generic\n" + " key-length based type check with its wrong bit-size calculation,\n" + " and leaving protected key verification to the pkey handler\n" + "\n" + "- Fix monwriter buffer reuse by rejecting records that change the data\n" + " length, preventing out of bounds user copy into the kernel buffer\n" + "\n" + "----------------------------------------------------------------\n" + "Gerald Schaefer (1):\n" + " s390/monwriter: Reject buffer reuse with different data length\n" + "\n" + "Holger Dengler (1):\n" + " pkey: Move keytype check from pkey api to handler\n" + "\n" + " drivers/s390/char/monwriter.c | 3 +++\n" + " drivers/s390/crypto/pkey_api.c | 11 +----------\n" + 2 files changed, 4 insertions(+), 10 deletions(-) -bc04910c153923b47bb208fe6b76d68b51e48705208d49d89f6560608c9b8f60 +849fce0b9b185bb13657011a13fa305f9ca0d7be4539cdcc14becf2cb2919e92
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.