From: "Andriy Makukha via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Andriy Makukha <andriy.makukha@gmail.com>,
Andrii Makukha <andriy.makukha@gmail.com>
Subject: [PATCH] strlcpy(): safer and faster version
Date: Thu, 16 Dec 2021 17:31:20 +0000 [thread overview]
Message-ID: <pull.1097.git.1639675881065.gitgitgadget@gmail.com> (raw)
From: Andrii Makukha <andriy.makukha@gmail.com>
Original strlcpy() has a significant disadvantage of being both unsafe
and inefficient. It unnecessarily calculates length of `src` which may
result in a segmentation fault if `src` is not terminated with a
NUL-character.
In this fix, if `src` is too long, strlcpy() returns `size`. This
allows to still detect an error while fixing the mentioned
vulnerabilities. It deviates from original strlcpy(), but for a good
reason.
Signed-off-by: Andrii Makukha <andriy.makukha@gmail.com>
---
strlcpy(): safer and faster version
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1097%2Famakukha%2Fmaint-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1097/amakukha/maint-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1097
compat/strlcpy.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/compat/strlcpy.c b/compat/strlcpy.c
index 4024c360301..e7fd11015c7 100644
--- a/compat/strlcpy.c
+++ b/compat/strlcpy.c
@@ -2,7 +2,12 @@
size_t gitstrlcpy(char *dest, const char *src, size_t size)
{
- size_t ret = strlen(src);
+ /*
+ * NOTE: original strlcpy returns full length of src, but this is
+ * unsafe. This implementation returns `size` if src is too long.
+ * This behaviour is faster and still allows to detect an issue.
+ */
+ size_t ret = strnlen(src, size);
if (size) {
size_t len = (ret >= size) ? size - 1 : ret;
base-commit: e9d7761bb94f20acc98824275e317fa82436c25d
--
gitgitgadget
next reply other threads:[~2021-12-16 17:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-16 17:31 Andriy Makukha via GitGitGadget [this message]
2021-12-16 18:14 ` [PATCH] strlcpy(): safer and faster version Jeff King
2021-12-16 22:32 ` Junio C Hamano
2021-12-17 5:22 ` Ævar Arnfjörð Bjarmason
2021-12-17 22:42 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1097.git.1639675881065.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=andriy.makukha@gmail.com \
--cc=git@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).