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

!10772 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/ZHHYBPOOEDMRO2FWZKPMP3B2A75MMPNV/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAGSJP 
 
Link:https://gitee.com/openeuler/kernel/pulls/10772

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 38d6c7af 512d0abc

drivers/s390/crypto/pkey_api.c

+3 −6
Original line number Diff line number Diff line
@@ -1491,8 +1491,7 @@ static long pkey_unlocked_ioctl(struct file *filp, unsigned int cmd, 
		rc = pkey_keyblob2pkey(kkey, ktp.keylen, ktp.protkey.protkey,

				       &ktp.protkey.len, &ktp.protkey.type);

		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));
@@ -1627,8 +1626,7 @@ static long pkey_unlocked_ioctl(struct file *filp, unsigned int cmd, 
					&ktp.protkey.type);

		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));
@@ -1753,8 +1751,7 @@ static long pkey_unlocked_ioctl(struct file *filp, unsigned int cmd, 
					protkey, &protkeylen, &ktp.pkeytype);

		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;