|
 |
da6346 |
From a787fc5c556cbbc7f3de308d25b7527f9da5a0da Mon Sep 17 00:00:00 2001
|
|
|
da6346 |
From: "Barton E. Schaefer" <schaefer@zsh.org>
|
|
|
da6346 |
Date: Sun, 19 Jan 2014 17:41:06 -0800
|
|
|
da6346 |
Subject: [PATCH] 32294: prevent buffer overflow when scanning very long
|
|
|
da6346 |
directory paths for symbolic links
|
|
|
da6346 |
|
|
|
da6346 |
Upstream-commit: 3e06aeabd8a9e8384ebaa8b08996cd1f64737210
|
|
|
da6346 |
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
|
da6346 |
---
|
|
|
da6346 |
Src/utils.c | 31 ++++++++++++++++++-------------
|
|
|
da6346 |
1 file changed, 18 insertions(+), 13 deletions(-)
|
|
|
da6346 |
|
|
|
da6346 |
diff --git a/Src/utils.c b/Src/utils.c
|
|
|
da6346 |
index 20fa59d..a197ef8 100644
|
|
|
da6346 |
--- a/Src/utils.c
|
|
|
da6346 |
+++ b/Src/utils.c
|
|
|
da6346 |
@@ -726,32 +726,36 @@ xsymlinks(char *s)
|
|
|
da6346 |
char **pp, **opp;
|
|
|
da6346 |
char xbuf2[PATH_MAX*2], xbuf3[PATH_MAX*2];
|
|
|
da6346 |
int t0, ret = 0;
|
|
|
da6346 |
+ zulong xbuflen = strlen(xbuf);
|
|
|
da6346 |
|
|
|
da6346 |
opp = pp = slashsplit(s);
|
|
|
da6346 |
- for (; *pp; pp++) {
|
|
|
da6346 |
- if (!strcmp(*pp, ".")) {
|
|
|
da6346 |
- zsfree(*pp);
|
|
|
da6346 |
+ for (; xbuflen < sizeof(xbuf) && *pp; pp++) {
|
|
|
da6346 |
+ if (!strcmp(*pp, "."))
|
|
|
da6346 |
continue;
|
|
|
da6346 |
- }
|
|
|
da6346 |
if (!strcmp(*pp, "..")) {
|
|
|
da6346 |
char *p;
|
|
|
da6346 |
|
|
|
da6346 |
- zsfree(*pp);
|
|
|
da6346 |
if (!strcmp(xbuf, "/"))
|
|
|
da6346 |
continue;
|
|
|
da6346 |
if (!*xbuf)
|
|
|
da6346 |
continue;
|
|
|
da6346 |
- p = xbuf + strlen(xbuf);
|
|
|
da6346 |
- while (*--p != '/');
|
|
|
da6346 |
+ p = xbuf + xbuflen;
|
|
|
da6346 |
+ while (*--p != '/')
|
|
|
da6346 |
+ xbuflen--;
|
|
|
da6346 |
*p = '\0';
|
|
|
da6346 |
continue;
|
|
|
da6346 |
}
|
|
|
da6346 |
sprintf(xbuf2, "%s/%s", xbuf, *pp);
|
|
|
da6346 |
t0 = readlink(unmeta(xbuf2), xbuf3, PATH_MAX);
|
|
|
da6346 |
if (t0 == -1) {
|
|
|
da6346 |
- strcat(xbuf, "/");
|
|
|
da6346 |
- strcat(xbuf, *pp);
|
|
|
da6346 |
- zsfree(*pp);
|
|
|
da6346 |
+ zulong pplen = strlen(*pp) + 1;
|
|
|
da6346 |
+ if ((xbuflen += pplen) < sizeof(xbuf)) {
|
|
|
da6346 |
+ strcat(xbuf, "/");
|
|
|
da6346 |
+ strcat(xbuf, *pp);
|
|
|
da6346 |
+ } else {
|
|
|
da6346 |
+ *xbuf = 0;
|
|
|
da6346 |
+ break;
|
|
|
da6346 |
+ }
|
|
|
da6346 |
} else {
|
|
|
da6346 |
ret = 1;
|
|
|
da6346 |
metafy(xbuf3, t0, META_NOALLOC);
|
|
|
da6346 |
@@ -760,10 +764,9 @@ xsymlinks(char *s)
|
|
|
da6346 |
xsymlinks(xbuf3 + 1);
|
|
|
da6346 |
} else
|
|
|
da6346 |
xsymlinks(xbuf3);
|
|
|
da6346 |
- zsfree(*pp);
|
|
|
da6346 |
}
|
|
|
da6346 |
}
|
|
|
da6346 |
- free(opp);
|
|
|
da6346 |
+ freearray(opp);
|
|
|
da6346 |
return ret;
|
|
|
da6346 |
}
|
|
|
da6346 |
|
|
|
da6346 |
@@ -780,8 +783,10 @@ xsymlink(char *s)
|
|
|
da6346 |
return NULL;
|
|
|
da6346 |
*xbuf = '\0';
|
|
|
da6346 |
xsymlinks(s + 1);
|
|
|
da6346 |
- if (!*xbuf)
|
|
|
da6346 |
+ if (!*xbuf) {
|
|
|
da6346 |
+ zwarn("path expansion failed, using root directory");
|
|
|
da6346 |
return ztrdup("/");
|
|
|
da6346 |
+ }
|
|
|
da6346 |
return ztrdup(xbuf);
|
|
|
da6346 |
}
|
|
|
da6346 |
|
|
|
da6346 |
--
|
|
|
da6346 |
2.14.3
|
|
|
da6346 |
|