From: Joe Simmons-Talbott <josimmon@redhat.com>
To: libc-alpha@sourceware.org
Cc: Joe Simmons-Talbott <josimmon@redhat.com>
Subject: [PATCH] grantpt: Get rid of alloca
Date: Thu, 1 Jun 2023 15:58:17 -0400 [thread overview]
Message-ID: <20230601195817.3251303-1-josimmon@redhat.com> (raw)
Replace alloca with a scratch_buffer to avoid potential stack overflows.
---
sysdeps/unix/grantpt.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/sysdeps/unix/grantpt.c b/sysdeps/unix/grantpt.c
index 38fce52576..e5d2390bf2 100644
--- a/sysdeps/unix/grantpt.c
+++ b/sysdeps/unix/grantpt.c
@@ -20,6 +20,7 @@
#include <fcntl.h>
#include <grp.h>
#include <limits.h>
+#include <scratch_buffer.h>
#include <stdlib.h>
#include <string.h>
#include <sys/resource.h>
@@ -147,7 +148,14 @@ grantpt (int fd)
/* `sysconf' does not support _SC_GETGR_R_SIZE_MAX.
Try a moderate value. */
grbuflen = 1024;
- grtmpbuf = (char *) __alloca (grbuflen);
+ struct scratch_buffer sbuf;
+ scratch_buffer_init (&sbuf);
+ if (!scratch_buffer_set_array_size (&sbuf, 1, grbuflen))
+ {
+ retval -1;
+ goto cleanup;
+ }
+ grtmpbuf = sbuf.data;
__getgrnam_r (TTY_GROUP, &grbuf, grtmpbuf, grbuflen, &p);
if (p != NULL)
tty_gid = p->gr_gid;
@@ -255,6 +263,8 @@ grantpt (int fd)
if (buf != _buf)
free (buf);
+ scratch_buffer_free(sbuf);
+
return retval;
}
libc_hidden_def (grantpt)
--
2.39.2
next reply other threads:[~2023-06-01 19:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-01 19:58 Joe Simmons-Talbott [this message]
2023-06-05 13:29 ` Florian Weimer
2023-06-05 13:37 ` Joe Simmons-Talbott
2023-06-05 18:14 ` Adhemerval Zanella Netto
2023-06-05 22:02 ` Joe Simmons-Talbott
2023-06-06 6:14 ` Siddhesh Poyarekar
2023-06-07 19:05 ` Zack Weinberg
2023-06-07 0:40 ` Samuel Thibault
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=20230601195817.3251303-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).