mirror of
https://github.com/dslm4515/BMLFS.git
synced 2025-08-16 16:39:38 +00:00
33 lines
1.0 KiB
Diff
33 lines
1.0 KiB
Diff
From 7750b5a25a8cf9081b7c248687c876d0068e85bb Mon Sep 17 00:00:00 2001
|
|
From: Denys Vlasenko <vda.linux@googlemail.com>
|
|
Date: Tue, 1 Mar 2022 09:56:54 +0100
|
|
Subject: [PATCH] ash: fix unsafe use of mempcpy
|
|
|
|
function old new delta
|
|
subevalvar 1549 1557 +8
|
|
|
|
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
|
|
---
|
|
shell/ash.c | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/shell/ash.c b/shell/ash.c
|
|
index 54335c5dd..44ec2eafd 100644
|
|
--- a/shell/ash.c
|
|
+++ b/shell/ash.c
|
|
@@ -7191,7 +7191,13 @@ subevalvar(char *start, char *str, int strloc,
|
|
len = orig_len - pos;
|
|
|
|
if (!quotes) {
|
|
- loc = mempcpy(startp, startp + pos, len);
|
|
+ /* want: loc = mempcpy(startp, startp + pos, len)
|
|
+ * but it does not allow overlapping arguments */
|
|
+ loc = startp;
|
|
+ while (--len >= 0) {
|
|
+ *loc = loc[pos];
|
|
+ loc++;
|
|
+ }
|
|
} else {
|
|
for (vstr = startp; pos != 0; pos--) {
|
|
if ((unsigned char)*vstr == CTLESC)
|