From: ebiggers3@gmail.com (Eric Biggers)
To: linux-security-module@vger.kernel.org
Subject: [PATCH v2 3/3] KEYS: use kmemdup() in request_key_auth_new()
Date: Thu, 21 Sep 2017 13:57:42 -0700 [thread overview]
Message-ID: <20170921205742.144596-4-ebiggers3@gmail.com> (raw)
In-Reply-To: <20170921205742.144596-1-ebiggers3@gmail.com>
From: Eric Biggers <ebiggers@google.com>
kmemdup() is preferred to kmalloc() followed by memcpy().
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
security/keys/request_key_auth.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/security/keys/request_key_auth.c b/security/keys/request_key_auth.c
index 2df92b619a38..9d536f9e5222 100644
--- a/security/keys/request_key_auth.c
+++ b/security/keys/request_key_auth.c
@@ -163,9 +163,10 @@ struct key *request_key_auth_new(struct key *target, const void *callout_info,
rka = kzalloc(sizeof(*rka), GFP_KERNEL);
if (!rka)
goto error_free_rka;
- rka->callout_info = kmalloc(callout_len, GFP_KERNEL);
+ rka->callout_info = kmemdup(callout_info, callout_len, GFP_KERNEL);
if (!rka->callout_info)
goto error_free_rka;
+ rka->callout_len = callout_len;
/* see if the calling process is already servicing the key request of
* another process */
@@ -196,8 +197,6 @@ struct key *request_key_auth_new(struct key *target, const void *callout_info,
rka->target_key = key_get(target);
rka->dest_keyring = key_get(dest_keyring);
- memcpy(rka->callout_info, callout_info, callout_len);
- rka->callout_len = callout_len;
/* allocate the auth key */
sprintf(desc, "%x", target->serial);
--
2.14.1.821.g8fa685d3b7-goog
--
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-09-21 20:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-21 20:57 [PATCH v2 0/3] KEYS: fix error handling in request_key_auth_new() Eric Biggers
2017-09-21 20:57 ` [PATCH v2 1/3] KEYS: fix cred refcount leak " Eric Biggers
2017-09-21 20:57 ` [PATCH v2 2/3] KEYS: don't revoke uninstantiated key " Eric Biggers
2017-09-21 20:57 ` Eric Biggers [this message]
2017-09-25 14:14 ` David Howells
2017-09-25 14:18 ` [PATCH v2 1/3] KEYS: fix cred refcount leak " David Howells
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=20170921205742.144596-4-ebiggers3@gmail.com \
--to=ebiggers3@gmail.com \
--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: 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).