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

!10798 s390/pkey: Use kfree_sensitive() to fix Coccinelle warnings 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhang Changzhong <zhangchangzhong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/WVJO5NCFLPYQVMKUUTGQZYYSNKFZ4SS3/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAGSJP 
 
Link:https://gitee.com/openeuler/kernel/pulls/10798

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents ba646506 a1c3073a

drivers/s390/crypto/pkey_api.c

+3 −6
Original line number Diff line number Diff line
@@ -1267,8 +1267,7 @@ static long pkey_unlocked_ioctl(struct file *filp, unsigned int cmd, 
			return PTR_ERR(kkey);

		rc = pkey_keyblob2pkey(kkey, ktp.keylen, &ktp.protkey);

		DEBUG_DBG("%s pkey_keyblob2pkey()=%d\n", __func__, rc);

		memzero_explicit(kkey, ktp.keylen);

		kfree(kkey);

		kfree_sensitive(kkey);

		if (!rc && copy_to_user(utp, &ktp, sizeof(ktp)))

			rc = -EFAULT;

		memzero_explicit(&ktp, sizeof(ktp));
@@ -1400,8 +1399,7 @@ static long pkey_unlocked_ioctl(struct file *filp, unsigned int cmd, 
					kkey, ktp.keylen, &ktp.protkey);

		DEBUG_DBG("%s pkey_keyblob2pkey2()=%d\n", __func__, rc);

		kfree(apqns);

		memzero_explicit(kkey, ktp.keylen);

		kfree(kkey);

		kfree_sensitive(kkey);

		if (!rc && copy_to_user(utp, &ktp, sizeof(ktp)))

			rc = -EFAULT;

		memzero_explicit(&ktp, sizeof(ktp));
@@ -1526,8 +1524,7 @@ static long pkey_unlocked_ioctl(struct file *filp, unsigned int cmd, 
					protkey, &protkeylen);

		DEBUG_DBG("%s pkey_keyblob2pkey3()=%d\n", __func__, rc);

		kfree(apqns);

		memzero_explicit(kkey, ktp.keylen);

		kfree(kkey);

		kfree_sensitive(kkey);

		if (rc) {

			kfree_sensitive(protkey);

			break;