s390/pkey: use kfree_sensitive() to fix Coccinelle warnings

[PATCH v3] s390/pkey: use kfree_sensitive() to fix Coccinelle warnings

Posted by Jules Irenge 1 year, 7 months ago

Replace memzero_explicit() and kfree() with kfree_sentive() to fix
warnings reported by Coccinelle

WARNING opportunity for kfree_sensitive/kvfree_sensitive (line 1506)
WARNING opportunity for kfree_sensitive/kvfree_sensitive (line 1643)
WARNING opportunity for kfree_sensitive/kvfree_sensitive (line 1770)

Signed-off-by: Jules Irenge <jbi.octave@gmail.com>
---
Changes in v3:
 - use kfree_sensitive() instead of kvfree_sensitive as a correction 

 drivers/s390/crypto/pkey_api.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/s390/crypto/pkey_api.c b/drivers/s390/crypto/pkey_api.c
index dccf664a3d95..933894065623 100644
--- a/drivers/s390/crypto/pkey_api.c
+++ b/drivers/s390/crypto/pkey_api.c
@@ -1503,8 +1503,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);
 		pr_debug("%s pkey_keyblob2pkey()=%d\n", __func__, rc);
-		memzero_explicit(kkey, ktp.keylen);
-		kfree(kkey);
+		kfree_sensitive(kkey);
 		if (rc)
 			break;
 		if (copy_to_user(utp, &ktp, sizeof(ktp)))
@@ -1640,8 +1639,7 @@ static long pkey_unlocked_ioctl(struct file *filp, unsigned int cmd,
 					&ktp.protkey.type);
 		pr_debug("%s pkey_keyblob2pkey2()=%d\n", __func__, rc);
 		kfree(apqns);
-		memzero_explicit(kkey, ktp.keylen);
-		kfree(kkey);
+		kfree_sensitive(kkey);
 		if (rc)
 			break;
 		if (copy_to_user(utp, &ktp, sizeof(ktp)))
@@ -1767,8 +1765,7 @@ static long pkey_unlocked_ioctl(struct file *filp, unsigned int cmd,
 					protkey, &protkeylen, &ktp.pkeytype);
 		pr_debug("%s pkey_keyblob2pkey3()=%d\n", __func__, rc);
 		kfree(apqns);
-		memzero_explicit(kkey, ktp.keylen);
-		kfree(kkey);
+		kfree_sensitive(kkey);
 		if (rc) {
 			kfree(protkey);
 			break;
-- 
2.43.2

Re: [PATCH v3] s390/pkey: use kfree_sensitive() to fix Coccinelle warnings

Posted by Holger Dengler 1 year, 7 months ago

On 07/05/2024 23:13, Jules Irenge wrote:
> Replace memzero_explicit() and kfree() with kfree_sentive() to fix
> warnings reported by Coccinelle
> 
> WARNING opportunity for kfree_sensitive/kvfree_sensitive (line 1506)
> WARNING opportunity for kfree_sensitive/kvfree_sensitive (line 1643)
> WARNING opportunity for kfree_sensitive/kvfree_sensitive (line 1770)
> 
> Signed-off-by: Jules Irenge <jbi.octave@gmail.com>

Thanks, looks good to me.
Reviewed-by: Holger Dengler <dengler@linux.ibm.com>

-- 
Mit freundlichen Grüßen / Kind regards
Holger Dengler
--
IBM Systems, Linux on IBM Z Development
dengler@linux.ibm.com

Re: [PATCH v3] s390/pkey: use kfree_sensitive() to fix Coccinelle warnings

Posted by Heiko Carstens 1 year, 7 months ago

On Wed, May 08, 2024 at 07:53:28AM +0200, Holger Dengler wrote:
> On 07/05/2024 23:13, Jules Irenge wrote:
> > Replace memzero_explicit() and kfree() with kfree_sentive() to fix
> > warnings reported by Coccinelle
> > 
> > WARNING opportunity for kfree_sensitive/kvfree_sensitive (line 1506)
> > WARNING opportunity for kfree_sensitive/kvfree_sensitive (line 1643)
> > WARNING opportunity for kfree_sensitive/kvfree_sensitive (line 1770)
> > 
> > Signed-off-by: Jules Irenge <jbi.octave@gmail.com>
> 
> Thanks, looks good to me.
> Reviewed-by: Holger Dengler <dengler@linux.ibm.com>

Applied, thanks!