public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] nss: Get rid of alloca usage in makedb's write_output.
@ 2023-10-05 13:21 Joe Simmons-Talbott
0 siblings, 0 replies; only message in thread
From: Joe Simmons-Talbott @ 2023-10-05 13:21 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=820948edd906ccb475a641ac5c5622e79e7084cf
commit 820948edd906ccb475a641ac5c5622e79e7084cf
Author: Joe Simmons-Talbott <josimmon@redhat.com>
Date: Wed Oct 4 18:18:02 2023 +0000
nss: Get rid of alloca usage in makedb's write_output.
Replace alloca usage with a scratch_buffer.
Reviewed-by: Arjun Shankar <arjun@redhat.com>
Diff:
---
nss/makedb.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/nss/makedb.c b/nss/makedb.c
index 48c8fe1333..e1c9508cd1 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,15 @@ 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;
@@ -803,6 +812,7 @@ write_output (int fd)
if (writev (fd, iov, iov_nelts) != keydataoffset)
{
error (0, errno, gettext ("failed to write new database file"));
+ scratch_buffer_free (&sbuf);
return EXIT_FAILURE;
}
@@ -810,6 +820,7 @@ write_output (int fd)
DIAG_POP_NEEDS_COMMENT;
#endif
+ scratch_buffer_free (&sbuf);
return EXIT_SUCCESS;
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-10-05 13:21 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-05 13:21 [glibc] nss: Get rid of alloca usage in makedb's write_output Joe Simmons-Talbott
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).