public inbox for libc-alpha@sourceware.org
 help / color / mirror / Atom feed
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 db-XXX
Date: Wed, 27 Sep 2023 11:38:29 -0400	[thread overview]
Message-ID: <20230927153831.2638026-1-josimmon@redhat.com> (raw)

Replace alloca usage with a scratch_buffer.
---
 nss/nss_db/db-XXX.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/nss/nss_db/db-XXX.c b/nss/nss_db/db-XXX.c
index 0ce730db5a..2df31a8077 100644
--- a/nss/nss_db/db-XXX.c
+++ b/nss/nss_db/db-XXX.c
@@ -18,6 +18,7 @@
 
 #include <dlfcn.h>
 #include <fcntl.h>
+#include <scratch_buffer.h>
 #include <stdint.h>
 #include <sys/mman.h>
 #include <libc-lock.h>
@@ -126,6 +127,8 @@ enum nss_status								      \
 			char *buffer, size_t buflen, int *errnop H_ERRNO_PROTO)\
 {									      \
   struct parser_data *data = (void *) buffer;				      \
+  struct scratch_buffer sbuf;						      \
+  scratch_buffer_init (&sbuf);						      \
 									      \
   if (buflen < sizeof *data)						      \
     {									      \
@@ -160,7 +163,13 @@ enum nss_status								      \
   else									      \
     {									      \
       const size_t size = (keysize) + 1;				      \
-      key = alloca (size);						      \
+      if (!scratch_buffer_set_array_size (&sbuf, 1, size))		      \
+	{								      \
+	  H_ERRNO_SET (NETDB_INTERNAL);					      \
+	  status = NSS_STATUS_TRYAGAIN;					      \
+	  return status;						      \
+	}								      \
+      key = sbuf.data;							      \
 									      \
       KEYPRINTF keypattern;						      \
     }									      \
@@ -216,6 +225,7 @@ enum nss_status								      \
 									      \
  out:									      \
   internal_endent (&state);						      \
+  scratch_buffer_free (&sbuf);						      \
 									      \
   return status;							      \
 }
-- 
2.39.2


             reply	other threads:[~2023-09-27 15:38 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-27 15:38 Joe Simmons-Talbott [this message]
2023-09-27 15:55 ` Andreas Schwab
2023-09-27 20:55   ` Joe Simmons-Talbott
2023-09-28  8:37     ` Andreas Schwab

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=20230927153831.2638026-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).