* [PATCH] resolv: Get rid of alloca usage.
@ 2023-09-21 16:16 Joe Simmons-Talbott
2023-09-21 17:36 ` Andreas Schwab
0 siblings, 1 reply; 3+ messages in thread
From: Joe Simmons-Talbott @ 2023-09-21 16:16 UTC (permalink / raw)
To: libc-alpha; +Cc: Joe Simmons-Talbott
Replace alloca usage with char arrays in _nss_dns_getnetbyaddr_r and
_nss_dns_getnetbyaddr_r.
---
resolv/nss_dns/dns-network.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c
index 1e6511a4f4..b67542c078 100644
--- a/resolv/nss_dns/dns-network.c
+++ b/resolv/nss_dns/dns-network.c
@@ -116,6 +116,7 @@ _nss_dns_getnetbyname_r (const char *name, struct netent *result,
querybuf *orig_net_buffer;
int anslen;
enum nss_status status;
+ char buf[1024];
struct resolv_context *ctx = __resolv_context_get ();
if (ctx == NULL)
@@ -125,7 +126,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 +171,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];
/* No net address lookup for IPv6 yet. */
if (type != AF_INET)
@@ -209,7 +211,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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] resolv: Get rid of alloca usage.
2023-09-21 16:16 [PATCH] resolv: Get rid of alloca usage Joe Simmons-Talbott
@ 2023-09-21 17:36 ` Andreas Schwab
2023-09-22 14:24 ` Joe Simmons-Talbott
0 siblings, 1 reply; 3+ messages in thread
From: Andreas Schwab @ 2023-09-21 17:36 UTC (permalink / raw)
To: Joe Simmons-Talbott; +Cc: libc-alpha
On Sep 21 2023, Joe Simmons-Talbott wrote:
> diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c
> index 1e6511a4f4..b67542c078 100644
> --- a/resolv/nss_dns/dns-network.c
> +++ b/resolv/nss_dns/dns-network.c
> @@ -116,6 +116,7 @@ _nss_dns_getnetbyname_r (const char *name, struct netent *result,
> querybuf *orig_net_buffer;
> int anslen;
> enum nss_status status;
> + char buf[1024];
>
> struct resolv_context *ctx = __resolv_context_get ();
> if (ctx == NULL)
> @@ -125,7 +126,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;
The buffer should be suitably aligned for querybuf. Since buf is an
array, it should not get an address-of operator.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1
"And now for something completely different."
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] resolv: Get rid of alloca usage.
2023-09-21 17:36 ` Andreas Schwab
@ 2023-09-22 14:24 ` Joe Simmons-Talbott
0 siblings, 0 replies; 3+ messages in thread
From: Joe Simmons-Talbott @ 2023-09-22 14:24 UTC (permalink / raw)
To: Andreas Schwab; +Cc: libc-alpha
On Thu, Sep 21, 2023 at 07:36:08PM +0200, Andreas Schwab wrote:
> On Sep 21 2023, Joe Simmons-Talbott wrote:
>
> > diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c
> > index 1e6511a4f4..b67542c078 100644
> > --- a/resolv/nss_dns/dns-network.c
> > +++ b/resolv/nss_dns/dns-network.c
> > @@ -116,6 +116,7 @@ _nss_dns_getnetbyname_r (const char *name, struct netent *result,
> > querybuf *orig_net_buffer;
> > int anslen;
> > enum nss_status status;
> > + char buf[1024];
> >
> > struct resolv_context *ctx = __resolv_context_get ();
> > if (ctx == NULL)
> > @@ -125,7 +126,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;
>
> The buffer should be suitably aligned for querybuf. Since buf is an
> array, it should not get an address-of operator.
>
I've posted a v2 which hopefully addresses this.
Thanks,
Joe
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-09-22 14:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-21 16:16 [PATCH] resolv: Get rid of alloca usage Joe Simmons-Talbott
2023-09-21 17:36 ` Andreas Schwab
2023-09-22 14:24 ` Joe Simmons-Talbott
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).