Sync with upstream master
This commit is contained in:
parent
e7c5d54c2d
commit
b5ec0026f9
3 changed files with 8 additions and 5 deletions
|
|
@ -31,7 +31,7 @@ index 18a83d2..6e16a9a 100644
|
|||
&& (!is_path || name[len] != ':'))
|
||||
return 0;
|
||||
|
||||
- if (__builtin_expect (secure, 0)
|
||||
- if (__glibc_unlikely (secure)
|
||||
- && ((name[len] != '\0' && name[len] != '/'
|
||||
- && (!is_path || name[len] != ':'))
|
||||
- || (name != start + 1 && (!is_path || name[-2] != ':'))))
|
||||
|
|
@ -68,7 +68,7 @@ index 18a83d2..6e16a9a 100644
|
|||
- repl = l->l_origin;
|
||||
+ /* For SUID/GUID programs $ORIGIN must always appear
|
||||
+ first in a path element. */
|
||||
+ if (__builtin_expect (INTUSE(__libc_enable_secure), 0)
|
||||
+ if (__glibc_unlikely (INTUSE(__libc_enable_secure))
|
||||
+ && ((name[len] != '\0' && name[len] != '/'
|
||||
+ && (!is_path || name[len] != ':'))
|
||||
+ || (name != start + 1 && (!is_path || name[-2] != ':'))))
|
||||
|
|
|
|||
Loading…
Reference in a new issue