Sync with upstream master
This commit is contained in:
parent
e7c5d54c2d
commit
b5ec0026f9
|
@ -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] != ':'))))
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
%define glibcsrcdir glibc-2.19-226-ga5e5f1e
|
||||
%define glibcsrcdir glibc-2.19-257-gf6488e2b
|
||||
%define glibcversion 2.19.90
|
||||
%define glibcrelease 8%{?dist}
|
||||
%define glibcrelease 9%{?dist}
|
||||
# Pre-release tarballs are pulled in from git using a command that is
|
||||
# effectively:
|
||||
#
|
||||
|
@ -1639,6 +1639,9 @@ rm -f *.filelist*
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Apr 03 2014 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.19.90-9
|
||||
- Sync with upstream master.
|
||||
|
||||
* Wed Mar 26 2014 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.19.90-8
|
||||
- Sync with upstream master.
|
||||
|
||||
|
|
Loading…
Reference in New Issue