From: Nick Alcock <nick.alcock@oracle.com>
To: dtrace@lists.linux.dev, dtrace-devel@oss.oracle.com
Cc: sam@gentoo.org
Subject: [PATCH 05/14] probe: get the size of the hash-lookup key right
Date: Thu, 24 Oct 2024 12:37:49 +0100 [thread overview]
Message-ID: <20241024113758.182050-6-nick.alcock@oracle.com> (raw)
In-Reply-To: <20241024113758.182050-1-nick.alcock@oracle.com>
This was allocated with alloca() but then snprintf()ed with a size of
INT_MAX. This makes _FORTIFY_SOURCE rightly unhappy.
Passing in the size we actually allocated is trivial.
Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
Bug: https://github.com/oracle/dtrace-utils/issues/78
---
libdtrace/dt_probe.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libdtrace/dt_probe.c b/libdtrace/dt_probe.c
index 686e2a661253..bb1773ee60d4 100644
--- a/libdtrace/dt_probe.c
+++ b/libdtrace/dt_probe.c
@@ -180,9 +180,9 @@ dt_probe_keylen(const dtrace_probedesc_t *pdp)
}
static char *
-dt_probe_key(const dtrace_probedesc_t *pdp, char *s)
+dt_probe_key(const dtrace_probedesc_t *pdp, char *s, size_t len)
{
- snprintf(s, INT_MAX, "%s:%s:%s", pdp->mod, pdp->fun, pdp->prb);
+ snprintf(s, len, "%s:%s:%s", pdp->mod, pdp->fun, pdp->prb);
return s;
}
@@ -204,7 +204,7 @@ dt_probe_lookup2(dt_provider_t *pvp, const char *s)
return NULL; /* dt_errno is set for us */
keylen = dt_probe_keylen(&pd);
- key = dt_probe_key(&pd, alloca(keylen));
+ key = dt_probe_key(&pd, alloca(keylen), keylen);
/*
* If the probe is already declared, then return the dt_probe_t from
--
2.46.0.278.g36e3a12567
next prev parent reply other threads:[~2024-10-24 11:38 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-24 11:37 [PATCH 00/14] gentoo, manpage, and assorted other small fixes Nick Alcock
2024-10-24 11:37 ` [PATCH 01/14] No longer depend on libsystemd Nick Alcock
2024-10-25 2:21 ` Kris Van Hees
2024-10-28 16:14 ` Nick Alcock
2024-10-24 11:37 ` [PATCH 02/14] pkgconfig: drop spaces in variable decls Nick Alcock
2024-10-25 2:22 ` Kris Van Hees
2024-10-28 16:16 ` Nick Alcock
2024-10-24 11:37 ` [PATCH 03/14] configure, build: make valgrind optional Nick Alcock
2024-10-25 2:30 ` Kris Van Hees
2024-10-28 16:38 ` Nick Alcock
2024-10-24 11:37 ` [PATCH 04/14] build: substitute LIBDIR in pkg-config files Nick Alcock
2024-10-25 2:32 ` Kris Van Hees
2024-10-24 11:37 ` Nick Alcock [this message]
2024-10-25 2:40 ` [PATCH 05/14] probe: get the size of the hash-lookup key right Kris Van Hees
2024-10-28 17:14 ` Nick Alcock
2024-10-24 11:37 ` [PATCH 06/14] configure: fix dreadful behaviour of MANDIR / --mandir Nick Alcock
2024-10-25 2:41 ` Kris Van Hees
2024-10-24 11:37 ` [PATCH 07/14] man: the synopsis is ended with .YS, not .SY Nick Alcock
2024-10-25 2:49 ` Kris Van Hees
2024-10-24 11:37 ` [PATCH 08/14] man: use \- for option dashes, not - Nick Alcock
2024-10-25 2:49 ` Kris Van Hees
2024-10-24 11:37 ` [PATCH 09/14] man: drop blank lines Nick Alcock
2024-10-25 2:50 ` Kris Van Hees
2024-10-24 11:37 ` [PATCH 10/14] man: fix blank line in environment variables list Nick Alcock
2024-10-25 2:50 ` Kris Van Hees
2024-10-24 11:37 ` [PATCH 11/14] dtprobed: fix parser child timeout Nick Alcock
2024-10-25 2:54 ` Kris Van Hees
2024-10-24 11:37 ` [PATCH 12/14] man: add manpage for dtprobed(8) Nick Alcock
2024-10-25 2:53 ` Kris Van Hees
2024-10-28 17:18 ` Nick Alcock
2024-10-24 11:37 ` [PATCH 13/14] man: drop double-\fB at the start of every option line Nick Alcock
2024-10-25 2:55 ` Kris Van Hees
2024-10-24 11:37 ` [PATCH 14/14] man: \fP-ize Nick Alcock
2024-10-25 2:55 ` Kris Van Hees
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=20241024113758.182050-6-nick.alcock@oracle.com \
--to=nick.alcock@oracle.com \
--cc=dtrace-devel@oss.oracle.com \
--cc=dtrace@lists.linux.dev \
--cc=sam@gentoo.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