diff options
| author | Andreas Schwab <schwab@redhat.com> | 2010-10-18 11:46:00 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2010-10-21 11:49:24 +0200 |
| commit | e933bae6a3b96ab5746dd5bdca23f7bf9131d2ba (patch) | |
| tree | 0636c430bc8729ec2bc96533822e68d948a597a1 | |
| parent | a2328cd094a6661ba6b5a36034b4300e332c9d6e (diff) | |
| download | glibc-e933bae6a3b96ab5746dd5bdca23f7bf9131d2ba.tar.gz glibc-e933bae6a3b96ab5746dd5bdca23f7bf9131d2ba.tar.xz glibc-e933bae6a3b96ab5746dd5bdca23f7bf9131d2ba.zip | |
Never expand $ORIGIN in privileged programs
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | elf/dl-load.c | 30 |
2 files changed, 19 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog index ccbba2f04b..690f7aa9c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-10-18 Andreas Schwab <schwab@redhat.com> + + * elf/dl-load.c (is_dst): Remove last parameter. + (_dl_dst_count): Ignore $ORIGIN in privileged programs. + (_dl_dst_substitute): Likewise. + 2010-05-26 H.J. Lu <hongjiu.lu@intel.com> [BZ #11640] diff --git a/elf/dl-load.c b/elf/dl-load.c index 597193c043..7115c683a5 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -169,8 +169,7 @@ local_strdup (const char *s) static size_t -is_dst (const char *start, const char *name, const char *str, - int is_path, int secure) +is_dst (const char *start, const char *name, const char *str, int is_path) { size_t len; bool is_curly = false; @@ -199,11 +198,6 @@ is_dst (const char *start, const char *name, const char *str, && (!is_path || name[len] != ':')) return 0; - if (__builtin_expect (secure, 0) - && ((name[len] != '\0' && (!is_path || name[len] != ':')) - || (name != start + 1 && (!is_path || name[-2] != ':')))) - return 0; - return len; } @@ -218,13 +212,12 @@ _dl_dst_count (const char *name, int is_path) { size_t len; - /* $ORIGIN is not expanded for SUID/GUID programs (except if it - is $ORIGIN alone) and it must always appear first in path. */ + /* $ORIGIN is not expanded for SUID/GUID programs. */ ++name; - if ((len = is_dst (start, name, "ORIGIN", is_path, - INTUSE(__libc_enable_secure))) != 0 - || (len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0 - || (len = is_dst (start, name, "LIB", is_path, 0)) != 0) + if (((len = is_dst (start, name, "ORIGIN", is_path)) != 0 + && !INTUSE(__libc_enable_secure)) + || (len = is_dst (start, name, "PLATFORM", is_path)) != 0 + || (len = is_dst (start, name, "LIB", is_path)) != 0) ++cnt; name = strchr (name + len, '$'); @@ -256,9 +249,12 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result, size_t len; ++name; - if ((len = is_dst (start, name, "ORIGIN", is_path, - INTUSE(__libc_enable_secure))) != 0) + if ((len = is_dst (start, name, "ORIGIN", is_path)) != 0) { + /* Ignore this path element in SUID/SGID programs. */ + if (INTUSE(__libc_enable_secure)) + repl = (const char *) -1; + else #ifndef SHARED if (l == NULL) repl = _dl_get_origin (); @@ -266,9 +262,9 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result, #endif repl = l->l_origin; } - else if ((len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0) + else if ((len = is_dst (start, name, "PLATFORM", is_path)) != 0) repl = GLRO(dl_platform); - else if ((len = is_dst (start, name, "LIB", is_path, 0)) != 0) + else if ((len = is_dst (start, name, "LIB", is_path)) != 0) repl = DL_DST_LIB; if (repl != NULL && repl != (const char *) -1) |