* [PATCH v3] nss: Get rid of alloca usage in db-XXX
@ 2023-09-28 13:05 Joe Simmons-Talbott
2023-10-06 15:01 ` Joe Simmons-Talbott
0 siblings, 1 reply; 2+ messages in thread
From: Joe Simmons-Talbott @ 2023-09-28 13:05 UTC (permalink / raw)
To: libc-alpha; +Cc: Joe Simmons-Talbott
Replace alloca usage with a scratch_buffer.
---
Changes to v2:
* fix '\' alignment.
* set errnop to errno rather than ENOMEM
nss/nss_db/db-XXX.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/nss/nss_db/db-XXX.c b/nss/nss_db/db-XXX.c
index 0ce730db5a..8f174fc8ea 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,14 @@ enum nss_status \
else \
{ \
const size_t size = (keysize) + 1; \
- key = alloca (size); \
+ if (!scratch_buffer_set_array_size (&sbuf, 1, size)) \
+ { \
+ *errnop = errno; \
+ H_ERRNO_SET (NETDB_INTERNAL); \
+ status = NSS_STATUS_TRYAGAIN; \
+ goto out; \
+ } \
+ key = sbuf.data; \
\
KEYPRINTF keypattern; \
} \
@@ -216,6 +226,7 @@ enum nss_status \
\
out: \
internal_endent (&state); \
+ scratch_buffer_free (&sbuf); \
\
return status; \
}
--
2.39.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH v3] nss: Get rid of alloca usage in db-XXX
2023-09-28 13:05 [PATCH v3] nss: Get rid of alloca usage in db-XXX Joe Simmons-Talbott
@ 2023-10-06 15:01 ` Joe Simmons-Talbott
0 siblings, 0 replies; 2+ messages in thread
From: Joe Simmons-Talbott @ 2023-10-06 15:01 UTC (permalink / raw)
To: libc-alpha
On Thu, Sep 28, 2023 at 09:05:37AM -0400, Joe Simmons-Talbott wrote:
> Replace alloca usage with a scratch_buffer.
Ping.
> ---
> Changes to v2:
> * fix '\' alignment.
> * set errnop to errno rather than ENOMEM
>
> nss/nss_db/db-XXX.c | 13 ++++++++++++-
> 1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/nss/nss_db/db-XXX.c b/nss/nss_db/db-XXX.c
> index 0ce730db5a..8f174fc8ea 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,14 @@ enum nss_status \
> else \
> { \
> const size_t size = (keysize) + 1; \
> - key = alloca (size); \
> + if (!scratch_buffer_set_array_size (&sbuf, 1, size)) \
> + { \
> + *errnop = errno; \
> + H_ERRNO_SET (NETDB_INTERNAL); \
> + status = NSS_STATUS_TRYAGAIN; \
> + goto out; \
> + } \
> + key = sbuf.data; \
> \
> KEYPRINTF keypattern; \
> } \
> @@ -216,6 +226,7 @@ enum nss_status \
> \
> out: \
> internal_endent (&state); \
> + scratch_buffer_free (&sbuf); \
> \
> return status; \
> }
> --
> 2.39.2
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-10-06 15:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-28 13:05 [PATCH v3] nss: Get rid of alloca usage in db-XXX Joe Simmons-Talbott
2023-10-06 15:01 ` 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).