From: Joe Simmons-Talbott <josimmon@redhat.com>
To: libc-alpha@sourceware.org
Cc: Joe Simmons-Talbott <josimmon@redhat.com>
Subject: [PATCH] getpw: Get rid of alloca
Date: Fri, 7 Jul 2023 16:04:00 -0400 [thread overview]
Message-ID: <20230707200400.378096-1-josimmon@redhat.com> (raw)
Use a scratch_buffer rather than alloca to avoid potential stack
overflow.
---
pwd/getpw.c | 34 +++++++++++++++++++++++++++-------
1 file changed, 27 insertions(+), 7 deletions(-)
diff --git a/pwd/getpw.c b/pwd/getpw.c
index cf747374b8..7a27d79910 100644
--- a/pwd/getpw.c
+++ b/pwd/getpw.c
@@ -15,8 +15,8 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <alloca.h>
#include <errno.h>
+#include <scratch_buffer.h>
#include <stdio.h>
#include <unistd.h>
#include <pwd.h>
@@ -34,28 +34,48 @@ __getpw (__uid_t uid, char *buf)
size_t buflen;
char *tmpbuf;
struct passwd resbuf, *p;
+ int retval = 0;
+ struct scratch_buffer sbuf;
+ scratch_buffer_init (&sbuf);
if (buf == NULL)
{
__set_errno (EINVAL);
- return -1;
+ retval = -1;
+ goto error_out;
}
buflen = __sysconf (_SC_GETPW_R_SIZE_MAX);
- tmpbuf = alloca (buflen);
+ if (!scratch_buffer_set_array_size (&sbuf, 1, buflen))
+ {
+ retval = -1;
+ goto error_out;
+ }
+ tmpbuf = sbuf.data;
if (__getpwuid_r (uid, &resbuf, tmpbuf, buflen, &p) != 0)
- return -1;
+ {
+ retval = -1;
+ goto error_out;
+ }
if (p == NULL)
- return -1;
+ {
+ retval = -1;
+ goto error_out;
+ }
if (sprintf (buf, "%s:%s:%lu:%lu:%s:%s:%s", p->pw_name, p->pw_passwd,
(unsigned long int) p->pw_uid, (unsigned long int) p->pw_gid,
p->pw_gecos, p->pw_dir, p->pw_shell) < 0)
- return -1;
+ {
+ retval = -1;
+ goto error_out;
+ }
- return 0;
+error_out:
+ scratch_buffer_free (&sbuf);
+ return retval;
}
weak_alias (__getpw, getpw)
--
2.39.2
next reply other threads:[~2023-07-07 20:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-07 20:04 Joe Simmons-Talbott [this message]
2023-08-10 13:45 ` Joe Simmons-Talbott
2023-08-28 13:21 ` Joe Simmons-Talbott
2023-08-28 17:01 ` Adhemerval Zanella Netto
2023-08-28 20:37 ` Joe Simmons-Talbott
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=20230707200400.378096-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).