diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-10-22 10:00:57 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2017-12-01 21:51:27 +0100 |
| commit | f1cf98b583787cfb6278baea46e286a0ee7567fd (patch) | |
| tree | fa89e4499c347e73c69cd24250bd27f2e5402415 | |
| parent | 6f9f307b5db6b2eeb7b92f2a75e5ab3e749c3d56 (diff) | |
| download | glibc-f1cf98b583787cfb6278baea46e286a0ee7567fd.tar.gz glibc-f1cf98b583787cfb6278baea46e286a0ee7567fd.tar.xz glibc-f1cf98b583787cfb6278baea46e286a0ee7567fd.zip | |
glob: Fix buffer overflow during GLOB_TILDE unescaping [BZ #22332]
(cherry picked from commit a159b53fa059947cc2548e3b0d5bdcf7b9630ba8)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | posix/glob.c | 4 |
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 1793816794..0ab08782b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-10-22 Paul Eggert <eggert@cs.ucla.edu> + + [BZ #22332] + * posix/glob.c (__glob): Fix buffer overflow during GLOB_TILDE + unescaping. + 2017-10-23 Wilco Dijkstra <wdijkstr@arm.com> * malloc/malloc.c (_int_malloc): Add SINGLE_THREAD_P path. diff --git a/NEWS b/NEWS index 037b28cb9b..7d3a326d88 100644 --- a/NEWS +++ b/NEWS @@ -35,6 +35,10 @@ Security related changes: processing, leading to a memory leak and, potentially, to a denial of service. + The glob function, when invoked with GLOB_TILDE and without + GLOB_NOESCAPE, could write past the end of a buffer while + unescaping user names. Reported by Tim Rühsen. + The following bugs are resolved with this release: [16750] ldd: Never run file directly. diff --git a/posix/glob.c b/posix/glob.c index c761c0861d..b2273ea7bc 100644 --- a/posix/glob.c +++ b/posix/glob.c @@ -850,11 +850,11 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int), char *p = mempcpy (newp, dirname + 1, unescape - dirname - 1); char *q = unescape; - while (*q != '\0') + while (q != end_name) { if (*q == '\\') { - if (q[1] == '\0') + if (q + 1 == end_name) { /* "~fo\\o\\" unescape to user_name "foo\\", but "~fo\\o\\/" unescape to user_name |