2020-09-26 09:06:15

by Vasily Gorbik

Subject: [GIT PULL] s390 updates for 5.9-rc7

Hello Linus,

please pull s390 changes for 5.9-rc7.

Thank you,
Vasily

The following changes since commit ba4f184e126b751d1bffad5897f263108befc780:

Linux 5.9-rc6 (2020-09-20 16:33:55 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-5.9-7

for you to fetch changes up to f7e80983f0cf470bb82036e73bff4d5a7daf8fc2:

s390/zcrypt: Fix ZCRYPT_PERDEV_REQCNT ioctl (2020-09-24 09:57:24 +0200)

----------------------------------------------------------------
s390 fixes for 5.9-rc7

- Fix truncated ZCRYPT_PERDEV_REQCNT ioctl result. Copy entire reqcnt list.

----------------------------------------------------------------
Christian Borntraeger (1):
s390/zcrypt: Fix ZCRYPT_PERDEV_REQCNT ioctl

drivers/s390/crypto/zcrypt_api.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/s390/crypto/zcrypt_api.c b/drivers/s390/crypto/zcrypt_api.c
index 4dbbfd88262c..f314936b5462 100644
--- a/drivers/s390/crypto/zcrypt_api.c
+++ b/drivers/s390/crypto/zcrypt_api.c
@@ -1449,7 +1449,8 @@ static long zcrypt_unlocked_ioctl(struct file *filp, unsigned int cmd,
if (!reqcnt)
return -ENOMEM;
zcrypt_perdev_reqcnt(reqcnt, AP_DEVICES);
- if (copy_to_user((int __user *) arg, reqcnt, sizeof(reqcnt)))
+ if (copy_to_user((int __user *) arg, reqcnt,
+ sizeof(u32) * AP_DEVICES))
rc = -EFAULT;
kfree(reqcnt);
return rc;

2020-09-26 18:06:16

by pr-tracker-bot

Subject: Re: [GIT PULL] s390 updates for 5.9-rc7

The pull request you sent on Sat, 26 Sep 2020 11:03:22 +0200:

> git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-5.9-7

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

Thank you!

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