From: Alex Dewar <alex.dewar90@gmail.com> Cc: Alex Dewar <alex.dewar90@gmail.com>, David Howells <dhowells@redhat.com>, Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>, James Morris <jmorris@namei.org>, "Serge E. Hallyn" <serge@hallyn.com>, keyrings@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] security: keys: Use kvfree_sensitive in a few places Date: Fri, 11 Sep 2020 16:06:50 +0000 [thread overview] Message-ID: <20200911160649.20164-1-alex.dewar90@gmail.com> (raw) In-Reply-To: <20200911160009.n2drvcjpzrsloxcj@lenovo-laptop> In big_key.c, there are a few places where memzero_explicit + kvfree is used. Replace these with a single call to kvfree_sensitive, to make the code more readable. Signed-off-by: Alex Dewar <alex.dewar90@gmail.com> --- v2 - Update commit message as per James Bottomley's suggestion 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); -- 2.28.0
WARNING: multiple messages have this Message-ID (diff)
From: Alex Dewar <alex.dewar90@gmail.com> To: unlisted-recipients:; (no To-header on input) Cc: Alex Dewar <alex.dewar90@gmail.com>, David Howells <dhowells@redhat.com>, Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>, James Morris <jmorris@namei.org>, "Serge E. Hallyn" <serge@hallyn.com>, keyrings@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] security: keys: Use kvfree_sensitive in a few places Date: Fri, 11 Sep 2020 17:06:50 +0100 [thread overview] Message-ID: <20200911160649.20164-1-alex.dewar90@gmail.com> (raw) In-Reply-To: <20200911160009.n2drvcjpzrsloxcj@lenovo-laptop> In big_key.c, there are a few places where memzero_explicit + kvfree is used. Replace these with a single call to kvfree_sensitive, to make the code more readable. Signed-off-by: Alex Dewar <alex.dewar90@gmail.com> --- v2 - Update commit message as per James Bottomley's suggestion 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); -- 2.28.0
next prev parent reply other threads:[~2020-09-11 16:06 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-09-11 11:44 [PATCH] security: keys: Use kvfree_sensitive in a few places Alex Dewar 2020-09-11 11:44 ` Alex Dewar 2020-09-11 15:04 ` James Bottomley 2020-09-11 15:04 ` James Bottomley 2020-09-11 16:00 ` Alex Dewar 2020-09-11 16:00 ` Alex Dewar 2020-09-11 16:03 ` Alex Dewar 2020-09-11 16:03 ` Alex Dewar 2020-09-11 16:06 ` Alex Dewar [this message] 2020-09-11 16:06 ` [PATCH v2] " Alex Dewar 2020-09-11 16:05 ` [PATCH] " Denis Efremov 2020-09-11 16:05 ` Denis Efremov 2020-09-11 16:09 ` Alex Dewar 2020-09-11 16:09 ` Alex Dewar 2020-09-14 18:05 ` Jarkko Sakkinen 2020-09-14 18:05 ` 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=20200911160649.20164-1-alex.dewar90@gmail.com \ --to=alex.dewar90@gmail.com \ --cc=dhowells@redhat.com \ --cc=jarkko.sakkinen@linux.intel.com \ --cc=jmorris@namei.org \ --cc=keyrings@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-security-module@vger.kernel.org \ --cc=serge@hallyn.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.