summaryrefslogtreecommitdiff
path: root/aports/busybox/0028-ash-use-after-free-in-bash-pattern-substitution.patch
diff options
context:
space:
mode:
authorPÁLI Gábor János <pali.gabor@gmail.com>2023-08-03 10:10:44 +0200
committerPÁLI Gábor János <pali.gabor@gmail.com>2023-09-16 17:58:03 +0200
commit89279d87c5d3e0ea330be1f927e3f3bc59dbc2a7 (patch)
tree353bc9a026d0140151e760efbc4f6a6a6b24a020 /aports/busybox/0028-ash-use-after-free-in-bash-pattern-substitution.patch
parent084335e136581edc28137b152cc559778224570e (diff)
downloadfreebsd-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/0028-ash-use-after-free-in-bash-pattern-substitution.patch')
-rw-r--r--aports/busybox/0028-ash-use-after-free-in-bash-pattern-substitution.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/aports/busybox/0028-ash-use-after-free-in-bash-pattern-substitution.patch b/aports/busybox/0028-ash-use-after-free-in-bash-pattern-substitution.patch
new file mode 100644
index 0000000..a8c13e4
--- /dev/null
+++ b/aports/busybox/0028-ash-use-after-free-in-bash-pattern-substitution.patch
@@ -0,0 +1,34 @@
+From 3e83699ce23400d75c7ddaa7ebfdec015177caa7 Mon Sep 17 00:00:00 2001
+From: Karsten Sperling <ksperling@apple.com>
+Date: Thu, 18 May 2023 16:47:49 +0200
+Subject: [PATCH] ash: use-after-free in bash pattern substitution
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit daa66ed6 fixed a number of use-after-free bugs in bash pattern
+substitution, however one "unguarded" STPUTC remained, which is fixed here.
+
+function old new delta
+subevalvar 1564 1576 +12
+
+Signed-off-by: Karsten Sperling <ksperling@apple.com>
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+Signed-off-by: Sören Tempel <soeren+git@soeren-tempel.net>
+---
+ shell/ash.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/shell/ash.c b/shell/ash.c
+index d2c5c5d50..51b627fcc 100644
+--- a/shell/ash.c
++++ b/shell/ash.c
+@@ -7370,6 +7370,8 @@ subevalvar(char *start, char *str, int strloc,
+ char *restart_detect = stackblock();
+ if (quotes && *loc == '\\') {
+ STPUTC(CTLESC, expdest);
++ if (stackblock() != restart_detect)
++ goto restart;
+ len++;
+ }
+ STPUTC(*loc, expdest);