[PATCH v1] s390/zcrypt: Remove the empty file

[PATCH v1] s390/zcrypt: Remove the empty file

[Rongguang Wei]

From: Rongguang Wei <weirongguang@kylinos.cn>

The files has no real user because CEX2 and CEX3 device drivers
are removed, also remove these empty files.

Fixes: 5ac8c72462cd ("s390/zcrypt: remove CEX2 and CEX3 device drivers")
Signed-off-by: Rongguang Wei <weirongguang@kylinos.cn>
---
 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

diff --git a/drivers/s390/crypto/zcrypt_cex2a.c b/drivers/s390/crypto/zcrypt_cex2a.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/drivers/s390/crypto/zcrypt_cex2a.h b/drivers/s390/crypto/zcrypt_cex2a.h
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/drivers/s390/crypto/zcrypt_cex2c.c b/drivers/s390/crypto/zcrypt_cex2c.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/drivers/s390/crypto/zcrypt_cex2c.h b/drivers/s390/crypto/zcrypt_cex2c.h
deleted file mode 100644
index e69de29bb2d1..000000000000
-- 
2.25.1

Re: [PATCH v1] s390/zcrypt: Remove the empty file

[Holger Dengler]

On 6/26/26 07:58, Rongguang Wei wrote:
> From: Rongguang Wei <weirongguang@kylinos.cn>
> 
> The files has no real user because CEX2 and CEX3 device drivers
> are removed, also remove these empty files.
> 
> Fixes: 5ac8c72462cd ("s390/zcrypt: remove CEX2 and CEX3 device drivers")
> Signed-off-by: Rongguang Wei <weirongguang@kylinos.cn>

Reviewed-by: Holger Dengler <dengler@linux.ibm.com>

-- 
Mit freundlichen Grüßen / Kind regards
Holger Dengler

[PATCH] s390/mm: Fix type mismatch in get_align_mask().

[Gerald Schaefer]

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(-)

diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
index 2a222a7e14f4..ef7bfc87758c 100644
--- a/arch/s390/mm/mmap.c
+++ b/arch/s390/mm/mmap.c
@@ -64,7 +64,7 @@ static inline unsigned long mmap_base(unsigned long rnd,
 	return PAGE_ALIGN(STACK_TOP - gap - rnd);
 }
 
-static int get_align_mask(struct file *filp, unsigned long flags)
+static unsigned long get_align_mask(struct file *filp, unsigned long flags)
 {
 	if (filp && is_file_hugepages(filp))
 		return huge_page_mask_align(filp);

base-commit: dc59e4fea9d83f03bad6bddf3fa2e52491777482
-- 
2.53.0

Re: [PATCH] s390/mm: Fix type mismatch in get_align_mask().

[Sven Schnelle]

Gerald Schaefer <gerald.schaefer@linux.ibm.com> writes:

> 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(-)
>
> diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
> index 2a222a7e14f4..ef7bfc87758c 100644
> --- a/arch/s390/mm/mmap.c
> +++ b/arch/s390/mm/mmap.c
> @@ -64,7 +64,7 @@ static inline unsigned long mmap_base(unsigned long rnd,
>  	return PAGE_ALIGN(STACK_TOP - gap - rnd);
>  }
>  
> -static int get_align_mask(struct file *filp, unsigned long flags)
> +static unsigned long get_align_mask(struct file *filp, unsigned long flags)
>  {
>  	if (filp && is_file_hugepages(filp))
>  		return huge_page_mask_align(filp);
>
> base-commit: dc59e4fea9d83f03bad6bddf3fa2e52491777482

Reviewed-by: Sven Schnelle <svens@linux.ibm.com>

Re: [PATCH] s390/mm: Fix type mismatch in get_align_mask().

[Vasily Gorbik]

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!

Re: [PATCH v1] s390/zcrypt: Remove the empty file

[Vasily Gorbik]

On Fri, Jun 26, 2026 at 01:58:20PM +0800, Rongguang Wei wrote:
> From: Rongguang Wei <weirongguang@kylinos.cn>
> 
> The files has no real user because CEX2 and CEX3 device drivers
> are removed, also remove these empty files.
> 
> Fixes: 5ac8c72462cd ("s390/zcrypt: remove CEX2 and CEX3 device drivers")
> Signed-off-by: Rongguang Wei <weirongguang@kylinos.cn>
> ---
>  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!

[GIT PULL] s390 updates for 7.2-rc2

[Vasily Gorbik]

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(-)

Re: [GIT PULL] s390 updates for 7.2-rc2

[pr-tracker-bot]

The pull request you sent on Sat, 4 Jul 2026 18:27:54 +0200:

> git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-7.2-3

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/7404ce51637231382873d0b55edabc2f3b841a9d

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html