aboutsummaryrefslogtreecommitdiff
path: root/nss
diff options
context:
space:
mode:
authorJoe Simmons-Talbott <josimmon@redhat.com>2023-10-04 18:18:02 +0000
committerJoe Simmons-Talbott <josimmon@redhat.com>2023-10-04 18:18:02 +0000
commit820948edd906ccb475a641ac5c5622e79e7084cf (patch)
treeadc2781848ff95fa5edff001dd951fd8582c55b2 /nss
parentbe7a5468d4f694ee8d052b537141f51af43ca7f2 (diff)
downloadglibc-820948edd906ccb475a641ac5c5622e79e7084cf.zip
glibc-820948edd906ccb475a641ac5c5622e79e7084cf.tar.gz
glibc-820948edd906ccb475a641ac5c5622e79e7084cf.tar.bz2
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>
Diffstat (limited to 'nss')
-rw-r--r--nss/makedb.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/nss/makedb.c b/nss/makedb.c
index 48c8fe1..e1c9508 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;
}