From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH 1/3] keytoc: check for memory allocation failures
Date: Mon, 14 Oct 2024 13:52:11 +0200 [thread overview]
Message-ID: <20241014115213.2846066-1-a.fatoum@pengutronix.de> (raw)
System headers may mark asprintf with an attribute requiring that the
result isn't used unchecked. Add the check and check the malloc() return
code as well for good measure.
Signed-off-by: Ahmad Fatoum <a.fatoum@barebox.org>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
scripts/keytoc.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/scripts/keytoc.c b/scripts/keytoc.c
index d5c8aa2e1216..c60df8a5f017 100644
--- a/scripts/keytoc.c
+++ b/scripts/keytoc.c
@@ -28,6 +28,12 @@
static int dts, standalone;
+static void enomem_exit(const char *func)
+{
+ fprintf(stderr, "%s: Out of memory\n", func);
+ exit(2);
+}
+
static int openssl_error(const char *fmt, ...)
{
va_list va;
@@ -351,6 +357,8 @@ static int print_bignum(BIGNUM *num, int num_bits, int width)
BN_exp(big2_32, big2, big32, ctx); /* B = 2^width */
arr = malloc(num_bits / width * sizeof(*arr));
+ if (!arr)
+ enomem_exit("malloc");
for (i = 0; i < num_bits / width; i++) {
BN_mod(tmp, num, big2_32, ctx); /* n = N mod B */
@@ -679,7 +687,9 @@ int main(int argc, char *argv[])
}
if (!keyname) {
- asprintf(&freep, "key_%d", keynum++);
+ ret = asprintf(&freep, "key_%d", keynum++);
+ if (ret < 0)
+ enomem_exit("asprintf");
keyname = freep;
}
--
2.39.5
next reply other threads:[~2024-10-14 13:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-14 11:52 Ahmad Fatoum [this message]
2024-10-14 11:52 ` [PATCH 2/3] crypto: fix compile with empty CONFIG_CRYPTO_PUBLIC_KEYS Ahmad Fatoum
2024-10-14 11:52 ` [PATCH 3/3] FIT: add dependency on CRYPTO_BUILTIN_KEYS for signature verification Ahmad Fatoum
2024-10-15 7:33 ` [PATCH 1/3] keytoc: check for memory allocation failures Sascha Hauer
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=20241014115213.2846066-1-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.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