From: GUO Zihua <guozihua@huawei.com>
To: <keyrings@vger.kernel.org>
Cc: <linux-crypto@vger.kernel.org>, <davem@davemloft.net>,
<dhowells@redhat.com>, <herbert@gondor.apana.org.au>,
<gustavoars@kernel.org>, <keescook@chromium.org>,
<linux-hardening@vger.kernel.org>
Subject: [PATCH v4] crypto: Use struct_size() helper with kmalloc()
Date: Thu, 19 May 2022 09:19:18 +0800 [thread overview]
Message-ID: <20220519011918.173538-1-guozihua@huawei.com> (raw)
Make use of struct_size() helper for structures containing flexible array
member instead of sizeof() which prevents potential issues, as well as
increase readability.
Reference: https://lore.kernel.org/all/CAHk-=wiGWjxs7EVUpccZEi6esvjpHJdgHQ=vtUeJ5crL62hx9A@mail.gmail.com/
Signed-off-by: GUO Zihua <guozihua@huawei.com>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
---
v4:
Change subject from "in kmalloc" to "with kmalloc" following David's
suggestion. Added Kees' review-by.
v3:
Update commit message according to Gustavo's review.
v2:
Use size_add() helper following Kees Cook's suggestion.
---
crypto/asymmetric_keys/asymmetric_type.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/crypto/asymmetric_keys/asymmetric_type.c b/crypto/asymmetric_keys/asymmetric_type.c
index 41a2f0eb4ce4..e020222b1fe5 100644
--- a/crypto/asymmetric_keys/asymmetric_type.c
+++ b/crypto/asymmetric_keys/asymmetric_type.c
@@ -152,7 +152,7 @@ struct asymmetric_key_id *asymmetric_key_generate_id(const void *val_1,
{
struct asymmetric_key_id *kid;
- kid = kmalloc(sizeof(struct asymmetric_key_id) + len_1 + len_2,
+ kid = kmalloc(struct_size(kid, data, size_add(len_1, len_2)),
GFP_KERNEL);
if (!kid)
return ERR_PTR(-ENOMEM);
@@ -244,7 +244,7 @@ struct asymmetric_key_id *asymmetric_key_hex_to_key_id(const char *id)
if (asciihexlen & 1)
return ERR_PTR(-EINVAL);
- match_id = kmalloc(sizeof(struct asymmetric_key_id) + asciihexlen / 2,
+ match_id = kmalloc(struct_size(match_id, data, asciihexlen / 2),
GFP_KERNEL);
if (!match_id)
return ERR_PTR(-ENOMEM);
--
2.36.0
reply other threads:[~2022-05-19 1:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20220519011918.173538-1-guozihua@huawei.com \
--to=guozihua@huawei.com \
--cc=davem@davemloft.net \
--cc=dhowells@redhat.com \
--cc=gustavoars@kernel.org \
--cc=herbert@gondor.apana.org.au \
--cc=keescook@chromium.org \
--cc=keyrings@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-hardening@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).