From: Justin Stitt <justinstitt@google.com>
To: Kees Cook <kees@kernel.org>, Andy Shevchenko <andy@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org,
Justin Stitt <justinstitt@google.com>
Subject: [PATCH] lib/string_helpers: rework overflow-dependent code
Date: Thu, 08 Aug 2024 14:43:56 -0700 [thread overview]
Message-ID: <20240808-b4-string_helpers_caa133-v1-1-686a455167c4@google.com> (raw)
When @size is 0, the desired behavior is to allow unlimited bytes to be
parsed. Currently, this relies on some intentional arithmetic overflow
where --size gives us SIZE_MAX when size is 0.
Explicitly spell out the desired behavior without relying on intentional
overflow/underflow.
Signed-off-by: Justin Stitt <justinstitt@google.com>
---
lib/string_helpers.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/string_helpers.c b/lib/string_helpers.c
index 69ba49b853c7..4f887aa62fa0 100644
--- a/lib/string_helpers.c
+++ b/lib/string_helpers.c
@@ -321,6 +321,9 @@ int string_unescape(char *src, char *dst, size_t size, unsigned int flags)
{
char *out = dst;
+ if (!size)
+ size = SIZE_MAX;
+
while (*src && --size) {
if (src[0] == '\\' && src[1] != '\0' && size > 1) {
src++;
---
base-commit: ee9a43b7cfe2d8a3520335fea7d8ce71b8cabd9d
change-id: 20240808-b4-string_helpers_caa133-53effde85a18
Best regards,
--
Justin Stitt <justinstitt@google.com>
next reply other threads:[~2024-08-08 21:44 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-08 21:43 Justin Stitt [this message]
2024-08-08 22:07 ` [PATCH] lib/string_helpers: rework overflow-dependent code Andy Shevchenko
2024-08-08 23:11 ` Kees Cook
2024-08-09 11:07 ` Andy Shevchenko
2024-08-09 23:53 ` Justin Stitt
2024-08-10 15:39 ` Andy Shevchenko
2024-08-10 15:41 ` Andy Shevchenko
2024-08-12 18:20 ` Justin Stitt
2024-08-12 18:43 ` Kees Cook
2024-08-12 20:05 ` Justin Stitt
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=20240808-b4-string_helpers_caa133-v1-1-686a455167c4@google.com \
--to=justinstitt@google.com \
--cc=akpm@linux-foundation.org \
--cc=andy@kernel.org \
--cc=kees@kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.