From: Joe Simmons-Talbott <josimmon@redhat.com>
To: libc-alpha@sourceware.org
Cc: Joe Simmons-Talbott <josimmon@redhat.com>
Subject: [PATCH] nss: Get rid of alloca usage in makedb's write_output.
Date: Tue, 26 Sep 2023 09:54:48 -0400 [thread overview]
Message-ID: <20230926135528.3517253-1-josimmon@redhat.com> (raw)
Replace alloca usage with a scratch_buffer.
---
nss/makedb.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/nss/makedb.c b/nss/makedb.c
index 48c8fe1333..c2779d9d9e 100644
--- a/nss/makedb.c
+++ b/nss/makedb.c
@@ -25,6 +25,7 @@
#include <inttypes.h>
#include <libintl.h>
#include <locale.h>
+#include <scratch_buffer.h>
#include <search.h>
#include <stdbool.h>
#include <stdio.h>
@@ -739,7 +740,16 @@ write_output (int fd)
struct nss_db_header *header;
uint64_t file_offset = (sizeof (struct nss_db_header)
+ (ndatabases * sizeof (header->dbs[0])));
- header = alloca (file_offset);
+ struct scratch_buffer sbuf;
+ scratch_buffer_init (&sbuf);
+
+
+ if (!scratch_buffer_set_array_size (&sbuf, 1, file_offset))
+ {
+ error (0, errno, gettext ("failed to allocate memory"));
+ return EXIT_FAILURE;
+ }
+ header = sbuf.data;
header->magic = NSS_DB_MAGIC;
header->ndbs = ndatabases;
@@ -802,6 +812,7 @@ write_output (int fd)
assert (iov_nelts <= INT_MAX);
if (writev (fd, iov, iov_nelts) != keydataoffset)
{
+ scratch_buffer_free (&sbuf);
error (0, errno, gettext ("failed to write new database file"));
return EXIT_FAILURE;
}
@@ -810,6 +821,7 @@ write_output (int fd)
DIAG_POP_NEEDS_COMMENT;
#endif
+ scratch_buffer_free (&sbuf);
return EXIT_SUCCESS;
}
--
2.39.2
next reply other threads:[~2023-09-26 13:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-26 13:54 Joe Simmons-Talbott [this message]
2023-09-28 11:16 ` Andreas Schwab
2023-09-28 13:14 ` Joe Simmons-Talbott
2023-09-28 13:32 ` Andreas Schwab
2023-09-28 15:52 ` Gabriel Ravier
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=20230926135528.3517253-1-josimmon@redhat.com \
--to=josimmon@redhat.com \
--cc=libc-alpha@sourceware.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 read-only IMAP folder(s) and NNTP newsgroup(s).