keyrings.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Howells <dhowells@redhat.com>
To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Cc: Denis Efremov <efremov@linux.com>,
	dhowells@redhat.com, keyrings@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 4/9] security/keys: use kvfree_sensitive()
Date: Fri, 27 Nov 2020 16:45:54 +0000	[thread overview]
Message-ID: <160649555474.2744658.8529054739735872592.stgit@warthog.procyon.org.uk> (raw)
In-Reply-To: <160649552401.2744658.15096366594785577090.stgit@warthog.procyon.org.uk>

From: Denis Efremov <efremov@linux.com>

Use kvfree_sensitive() instead of open-coding it.

Signed-off-by: Denis Efremov <efremov@linux.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
---

 security/keys/big_key.c |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/security/keys/big_key.c b/security/keys/big_key.c
index 691347dea3c1..d17e5f09eeb8 100644
--- a/security/keys/big_key.c
+++ b/security/keys/big_key.c
@@ -121,8 +121,7 @@ int big_key_preparse(struct key_preparsed_payload *prep)
 		*path = file->f_path;
 		path_get(path);
 		fput(file);
-		memzero_explicit(buf, enclen);
-		kvfree(buf);
+		kvfree_sensitive(buf, enclen);
 	} else {
 		/* Just store the data in a buffer */
 		void *data = kmalloc(datalen, GFP_KERNEL);
@@ -140,8 +139,7 @@ int big_key_preparse(struct key_preparsed_payload *prep)
 err_enckey:
 	kfree_sensitive(enckey);
 error:
-	memzero_explicit(buf, enclen);
-	kvfree(buf);
+	kvfree_sensitive(buf, enclen);
 	return ret;
 }
 
@@ -273,8 +271,7 @@ long big_key_read(const struct key *key, char *buffer, size_t buflen)
 err_fput:
 		fput(file);
 error:
-		memzero_explicit(buf, enclen);
-		kvfree(buf);
+		kvfree_sensitive(buf, enclen);
 	} else {
 		ret = datalen;
 		memcpy(buffer, key->payload.data[big_key_data], datalen);



  parent reply	other threads:[~2020-11-27 16:46 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-27 16:45 [PATCH 0/9] keys: Miscellaneous fixes David Howells
2020-11-27 16:45 ` [PATCH 1/9] security: keys: Fix fall-through warnings for Clang David Howells
2020-11-27 16:45 ` [PATCH 2/9] keys: Remove outdated __user annotations David Howells
2020-11-27 16:45 ` [PATCH 3/9] watch_queue: Drop references to /dev/watch_queue David Howells
2020-11-27 16:45 ` David Howells [this message]
2020-11-27 16:46 ` [PATCH 5/9] KEYS: asymmetric: Fix kerneldoc David Howells
2020-11-27 16:46 ` [PATCH 6/9] security: keys: delete repeated words in comments David Howells
2020-11-27 16:46 ` [PATCH 7/9] KEYS: remove redundant memset David Howells
2020-11-27 16:46 ` [PATCH 8/9] crypto: asymmetric_keys: fix some comments in pkcs7_parser.h David Howells
2020-11-27 16:46 ` [PATCH 9/9] encrypted-keys: Replace HTTP links with HTTPS ones David Howells
2020-11-29  3:38 ` [PATCH 0/9] keys: Miscellaneous fixes Jarkko Sakkinen
2020-11-30  9:21 ` David Howells
2020-12-02 16:43   ` Jarkko Sakkinen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=160649555474.2744658.8529054739735872592.stgit@warthog.procyon.org.uk \
    --to=dhowells@redhat.com \
    --cc=efremov@linux.com \
    --cc=jarkko.sakkinen@linux.intel.com \
    --cc=keyrings@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).