From: Eric Biggers <ebiggers3@gmail.com> To: keyrings@vger.kernel.org Cc: linux-security-module@vger.kernel.org, David Howells <dhowells@redhat.com>, linux-kernel@vger.kernel.org, Eric Biggers <ebiggers@google.com> Subject: [PATCH 1/5] KEYS: sanitize add_key() and keyctl() key payloads Date: Fri, 21 Apr 2017 01:30:33 -0700 [thread overview] Message-ID: <20170421083037.12746-2-ebiggers3@gmail.com> (raw) In-Reply-To: <20170421083037.12746-1-ebiggers3@gmail.com> From: Eric Biggers <ebiggers@google.com> Before returning from add_key() or one of the keyctl() commands that takes in a key payload, zero the temporary buffer that was allocated to hold the key payload copied from userspace. This may contain sensitive key material that should not be kept around in the slab caches. This must not be applied before the patch "KEYS: fix dereferencing NULL payload with nonzero length". Signed-off-by: Eric Biggers <ebiggers@google.com> --- security/keys/keyctl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index 10fcea154c0f..d2852621e358 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c @@ -137,6 +137,7 @@ SYSCALL_DEFINE5(add_key, const char __user *, _type, key_ref_put(keyring_ref); error3: + memzero_explicit(payload, plen); kvfree(payload); error2: kfree(description); @@ -347,7 +348,7 @@ long keyctl_update_key(key_serial_t id, key_ref_put(key_ref); error2: - kfree(payload); + kzfree(payload); error: return ret; } @@ -1098,6 +1099,7 @@ long keyctl_instantiate_key_common(key_serial_t id, keyctl_change_reqkey_auth(NULL); error2: + memzero_explicit(payload, plen); kvfree(payload); error: return ret; -- 2.12.2
WARNING: multiple messages have this Message-ID (diff)
From: ebiggers3@gmail.com (Eric Biggers) To: linux-security-module@vger.kernel.org Subject: [PATCH 1/5] KEYS: sanitize add_key() and keyctl() key payloads Date: Fri, 21 Apr 2017 01:30:33 -0700 [thread overview] Message-ID: <20170421083037.12746-2-ebiggers3@gmail.com> (raw) In-Reply-To: <20170421083037.12746-1-ebiggers3@gmail.com> From: Eric Biggers <ebiggers@google.com> Before returning from add_key() or one of the keyctl() commands that takes in a key payload, zero the temporary buffer that was allocated to hold the key payload copied from userspace. This may contain sensitive key material that should not be kept around in the slab caches. This must not be applied before the patch "KEYS: fix dereferencing NULL payload with nonzero length". Signed-off-by: Eric Biggers <ebiggers@google.com> --- security/keys/keyctl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index 10fcea154c0f..d2852621e358 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c @@ -137,6 +137,7 @@ SYSCALL_DEFINE5(add_key, const char __user *, _type, key_ref_put(keyring_ref); error3: + memzero_explicit(payload, plen); kvfree(payload); error2: kfree(description); @@ -347,7 +348,7 @@ long keyctl_update_key(key_serial_t id, key_ref_put(key_ref); error2: - kfree(payload); + kzfree(payload); error: return ret; } @@ -1098,6 +1099,7 @@ long keyctl_instantiate_key_common(key_serial_t id, keyctl_change_reqkey_auth(NULL); error2: + memzero_explicit(payload, plen); kvfree(payload); error: return ret; -- 2.12.2 -- To unsubscribe from this list: send the line "unsubscribe linux-security-module" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2017-04-21 8:32 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-04-21 8:30 [PATCH 0/5] KEYS: sanitize key payloads Eric Biggers 2017-04-21 8:30 ` Eric Biggers 2017-04-21 8:30 ` Eric Biggers [this message] 2017-04-21 8:30 ` [PATCH 1/5] KEYS: sanitize add_key() and keyctl() " Eric Biggers 2017-04-28 17:57 ` Eric Biggers 2017-04-28 17:57 ` Eric Biggers 2017-04-21 8:30 ` [PATCH 2/5] KEYS: user_defined: sanitize " Eric Biggers 2017-04-21 8:30 ` Eric Biggers 2017-04-21 8:30 ` [PATCH 3/5] KEYS: encrypted: sanitize all key material Eric Biggers 2017-04-21 8:30 ` Eric Biggers 2017-04-21 8:30 ` [PATCH 4/5] KEYS: trusted: " Eric Biggers 2017-04-21 8:30 ` Eric Biggers 2017-04-21 8:30 ` [PATCH 5/5] KEYS: sanitize key structs before freeing Eric Biggers 2017-04-21 8:30 ` Eric Biggers 2017-04-21 13:57 ` [PATCH 2/5] KEYS: user_defined: sanitize key payloads David Howells 2017-04-21 13:57 ` David Howells 2017-04-21 18:34 ` Eric Biggers 2017-04-21 18:34 ` Eric Biggers 2017-04-24 14:14 ` David Howells 2017-04-24 14:14 ` David Howells 2017-04-21 14:31 ` [PATCH 3/5] KEYS: encrypted: sanitize all key material David Howells 2017-04-21 14:31 ` David Howells 2017-04-21 18:24 ` Eric Biggers 2017-04-21 18:24 ` Eric Biggers 2017-04-24 14:14 ` David Howells 2017-04-24 14:14 ` David Howells 2017-04-27 15:09 ` [PATCH 0/5] KEYS: sanitize key payloads David Howells 2017-04-27 15:09 ` David Howells 2017-04-27 17:43 ` Eric Biggers 2017-04-27 17:43 ` Eric Biggers 2017-06-02 15:34 ` [PATCH 1/5] KEYS: sanitize add_key() and keyctl() " David Howells 2017-06-02 15:34 ` David Howells 2017-06-02 15:34 ` David Howells 2017-06-02 17:24 ` Eric Biggers 2017-06-02 17:24 ` Eric Biggers 2017-06-02 17:24 ` Eric Biggers
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=20170421083037.12746-2-ebiggers3@gmail.com \ --to=ebiggers3@gmail.com \ --cc=dhowells@redhat.com \ --cc=ebiggers@google.com \ --cc=keyrings@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-security-module@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: 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.