From: Joe Simmons-Talbott <josimmon@redhat.com>
To: libc-alpha@sourceware.org
Cc: Joe Simmons-Talbott <josimmon@redhat.com>
Subject: [PATCH v2] resolv: Get rid of alloca usage.
Date: Fri, 22 Sep 2023 10:10:33 -0400 [thread overview]
Message-ID: <20230922141044.2584311-1-josimmon@redhat.com> (raw)
Replace alloca usage with char arrays in _nss_dns_getnetbyname_r and
_nss_dns_getnetbyaddr_r.
---
resolv/nss_dns/dns-network.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c
index 1e6511a4f4..b429384da1 100644
--- a/resolv/nss_dns/dns-network.c
+++ b/resolv/nss_dns/dns-network.c
@@ -116,6 +116,8 @@ _nss_dns_getnetbyname_r (const char *name, struct netent *result,
querybuf *orig_net_buffer;
int anslen;
enum nss_status status;
+ char buf[1024] __attribute__ ((__aligned__ (__alignof__ (querybuf))));
+
struct resolv_context *ctx = __resolv_context_get ();
if (ctx == NULL)
@@ -125,7 +127,7 @@ _nss_dns_getnetbyname_r (const char *name, struct netent *result,
return NSS_STATUS_UNAVAIL;
}
- net_buffer.buf = orig_net_buffer = (querybuf *) alloca (1024);
+ net_buffer.buf = orig_net_buffer = (querybuf *) buf;
anslen = __res_context_search
(ctx, name, C_IN, T_PTR, net_buffer.buf->buf,
@@ -170,6 +172,7 @@ _nss_dns_getnetbyaddr_r (uint32_t net, int type, struct netent *result,
int cnt, anslen;
uint32_t net2;
int olderr = errno;
+ char buf[1024] __attribute__ ((__aligned__ (__alignof__ (querybuf))));
/* No net address lookup for IPv6 yet. */
if (type != AF_INET)
@@ -209,7 +212,7 @@ _nss_dns_getnetbyaddr_r (uint32_t net, int type, struct netent *result,
break;
}
- net_buffer.buf = orig_net_buffer = (querybuf *) alloca (1024);
+ net_buffer.buf = orig_net_buffer = (querybuf *) buf;
anslen = __res_context_query (ctx, qbuf, C_IN, T_PTR, net_buffer.buf->buf,
1024, &net_buffer.ptr, NULL, NULL, NULL, NULL);
--
2.39.2
next reply other threads:[~2023-09-22 14:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-22 14:10 Joe Simmons-Talbott [this message]
2023-10-02 12:25 ` Joe Simmons-Talbott
2023-10-10 19:04 ` 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=20230922141044.2584311-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).