Unverified Commit 5809e900 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10803 s390/pkey: Wipe sensitive data on failure 

Merge Pull Request from: @ci-robot 
 
PR sync from: Peng Zhang <zhangpeng362@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/C6VHBNEPEBOXDYRTLFJYWIAEHF4K72WA/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAGSLY 
 
Link:https://gitee.com/openeuler/kernel/pulls/10803

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 89624e1e e24f6fbc

drivers/s390/crypto/pkey_api.c

+2 −2
Original line number Diff line number Diff line
@@ -1089,7 +1089,7 @@ static long pkey_unlocked_ioctl(struct file *filp, unsigned int cmd, 
		if (rc)

			break;

		if (copy_to_user(ucs, &kcs, sizeof(kcs)))

			return -EFAULT;

			rc = -EFAULT;

		memzero_explicit(&kcs, sizeof(kcs));

		break;

	}
@@ -1120,7 +1120,7 @@ static long pkey_unlocked_ioctl(struct file *filp, unsigned int cmd, 
		if (rc)

			break;

		if (copy_to_user(ucp, &kcp, sizeof(kcp)))

			return -EFAULT;

			rc = -EFAULT;

		memzero_explicit(&kcp, sizeof(kcp));

		break;

	}