From: Tyler Retzlaff <roretzla@linux.microsoft.com>
To: dev@dpdk.org
Cc: Ciara Power <ciara.power@intel.com>,
bruce.richardson@intel.com,
Tyler Retzlaff <roretzla@linux.microsoft.com>
Subject: [PATCH] telemetry: avoid truncation of strlcpy return before check
Date: Wed, 2 Aug 2023 14:21:01 -0700 [thread overview]
Message-ID: <1691011261-5666-1-git-send-email-roretzla@linux.microsoft.com> (raw)
strlcpy returns type size_t when directly assigning to
struct rte_tel_data data_len field it may be truncated leading to
compromised length check that follows
Since the limit in the check is < UINT_MAX the value returned is
safe to be cast to unsigned int (which may be narrower than size_t)
but only after being checked against RTE_TEL_MAX_SINGLE_STRING_LEN
Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
lib/telemetry/telemetry_data.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/telemetry/telemetry_data.c b/lib/telemetry/telemetry_data.c
index 3b1a240..52307cb 100644
--- a/lib/telemetry/telemetry_data.c
+++ b/lib/telemetry/telemetry_data.c
@@ -41,12 +41,13 @@
int
rte_tel_data_string(struct rte_tel_data *d, const char *str)
{
+ const size_t len = strlcpy(d->data.str, str, sizeof(d->data.str));
d->type = TEL_STRING;
- d->data_len = strlcpy(d->data.str, str, sizeof(d->data.str));
- if (d->data_len >= RTE_TEL_MAX_SINGLE_STRING_LEN) {
+ if (len >= RTE_TEL_MAX_SINGLE_STRING_LEN) {
d->data_len = RTE_TEL_MAX_SINGLE_STRING_LEN - 1;
return E2BIG; /* not necessarily and error, just truncation */
}
+ d->data_len = (unsigned int)len;
return 0;
}
--
1.8.3.1
next reply other threads:[~2023-08-02 21:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-02 21:21 Tyler Retzlaff [this message]
2023-08-03 8:15 ` Bruce Richardson
2023-08-08 2:24 ` lihuisong (C)
2023-08-08 17:59 ` Tyler Retzlaff
2023-08-08 18:35 ` Bruce Richardson
2024-02-01 11:45 ` David Marchand
2024-02-01 16:42 ` Tyler Retzlaff
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=1691011261-5666-1-git-send-email-roretzla@linux.microsoft.com \
--to=roretzla@linux.microsoft.com \
--cc=bruce.richardson@intel.com \
--cc=ciara.power@intel.com \
--cc=dev@dpdk.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 NNTP newsgroup(s).