diff options
| author | PÁLI Gábor János <pali.gabor@gmail.com> | 2023-08-03 10:10:44 +0200 |
|---|---|---|
| committer | PÁLI Gábor János <pali.gabor@gmail.com> | 2023-09-16 17:58:03 +0200 |
| commit | 89279d87c5d3e0ea330be1f927e3f3bc59dbc2a7 (patch) | |
| tree | 353bc9a026d0140151e760efbc4f6a6a6b24a020 /aports/busybox/0015-ed-don-t-use-memcpy-with-overlapping-memory-regions.patch | |
| parent | 084335e136581edc28137b152cc559778224570e (diff) | |
| download | freebsd-wifibox-alpine-89279d87c5d3e0ea330be1f927e3f3bc59dbc2a7.zip | |
Update to Linux 6.1 and Alpine 3.18
- Update base-layout to 3.4.3
- Update busybox to 1.36.1
- Update iptables to 1.8.9
- Update linux-lts to 6.1.53
- Update to openrc to 0.48
- Update rtl8821ce to snapshot of 20230915
- Replace rtwB88 with a third-party driver
- Update rtw89 to snapshot of 20230913
- Import wpa_supplicant fixes from Arch Linux
Diffstat (limited to 'aports/busybox/0015-ed-don-t-use-memcpy-with-overlapping-memory-regions.patch')
| -rw-r--r-- | aports/busybox/0015-ed-don-t-use-memcpy-with-overlapping-memory-regions.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/aports/busybox/0015-ed-don-t-use-memcpy-with-overlapping-memory-regions.patch b/aports/busybox/0015-ed-don-t-use-memcpy-with-overlapping-memory-regions.patch deleted file mode 100644 index 5697a55..0000000 --- a/aports/busybox/0015-ed-don-t-use-memcpy-with-overlapping-memory-regions.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 65bb493f2475368161431ed72816fd0c61e479b1 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 09:29:21 +0100 -Subject: [PATCH] ed: don't use memcpy with overlapping memory regions - -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 ---- - editors/ed.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/editors/ed.c b/editors/ed.c -index 209ce9942..4a84f7433 100644 ---- 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); - |