summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViorel Munteanu <ceamac@gentoo.org>2023-08-17 16:00:48 +0300
committerViorel Munteanu <ceamac@gentoo.org>2023-08-17 16:00:48 +0300
commitc5dc76e527ab17ffda6ca8118cde4efbcffcb09a (patch)
tree96f5efef825ac302ddad743f2490b253d721693c /sys-apps/busybox/files
parentsys-apps/busybox: drop 1.34.1-r2 (diff)
downloadgentoo-c5dc76e527ab17ffda6ca8118cde4efbcffcb09a.tar.gz
gentoo-c5dc76e527ab17ffda6ca8118cde4efbcffcb09a.tar.bz2
gentoo-c5dc76e527ab17ffda6ca8118cde4efbcffcb09a.zip
sys-apps/busybox: drop 1.35.0-r2
Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
Diffstat (limited to 'sys-apps/busybox/files')
-rw-r--r--sys-apps/busybox/files/busybox-1.36.0-ed-memcpy-overlapping.patch38
1 files changed, 0 insertions, 38 deletions
diff --git a/sys-apps/busybox/files/busybox-1.36.0-ed-memcpy-overlapping.patch b/sys-apps/busybox/files/busybox-1.36.0-ed-memcpy-overlapping.patch
deleted file mode 100644
index e474391ccd4d..000000000000
--- a/sys-apps/busybox/files/busybox-1.36.0-ed-memcpy-overlapping.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://git.busybox.net/busybox/commit/?id=ca96022d6edaaf619324db5a481698231d74d1df
-
-From ca96022d6edaaf619324db5a481698231d74d1df Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Tue, 8 Feb 2022 20:29:30 +0100
-Subject: ed: don't use memcpy with overlapping memory regions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The memcpy invocations in the subCommand function, modified by this
-commit, previously used memcpy with overlapping memory regions. This is
-undefined behavior. On Alpine Linux, it causes BusyBox ed to crash since
-we compile BusyBox with -D_FORTIFY_SOURCE=2 and our fortify-headers
-implementation catches this source of undefined behavior [0]. The issue
-can only be triggered if the replacement string is the same size or
-shorter than the old string.
-
-Looking at the code, it seems to me that a memmove(3) is what was
-actually intended here, this commit modifies the code accordingly.
-
-[0]: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13504
-
-Signed-off-by: Sören Tempel <soeren+git@soeren-tempel.net>
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---- a/editors/ed.c
-+++ b/editors/ed.c
-@@ -720,7 +720,7 @@ static void subCommand(const char *cmd, int num1, int num2)
- if (deltaLen <= 0) {
- memcpy(&lp->data[offset], newStr, newLen);
- if (deltaLen) {
-- memcpy(&lp->data[offset + newLen],
-+ memmove(&lp->data[offset + newLen],
- &lp->data[offset + oldLen],
- lp->len - offset - oldLen);
-
---
-cgit v1.2.3