diff --git a/glibc-rh741105.patch b/glibc-rh741105.patch index 8252062..973beb5 100644 --- a/glibc-rh741105.patch +++ b/glibc-rh741105.patch @@ -5,7 +5,7 @@ diff -rup a/elf/dl-load.c b/elf/dl-load.c = N_("ELF load command address/offset not properly aligned"); goto call_lose; } -+ if (__builtin_expect ((ph->p_offset + ph->p_filesz > st.st_size), 0)) ++ if (__glibc_unlikely (ph->p_offset + ph->p_filesz > st.st_size)) + { + /* If the segment requires zeroing of part of its last + page, we'll crash when accessing the unmapped page. @@ -16,6 +16,5 @@ diff -rup a/elf/dl-load.c b/elf/dl-load.c + goto call_lose; + } - c = &loadcmds[nloadcmds++]; + struct loadcmd *c = &loadcmds[nloadcmds++]; c->mapstart = ph->p_vaddr & ~(GLRO(dl_pagesize) - 1); -Only in b/elf: dl-load.c.orig diff --git a/glibc.spec b/glibc.spec index c1b572f..3495e68 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ -%define glibcsrcdir glibc-2.19-257-gf6488e2b +%define glibcsrcdir glibc-2.19-269-ga4c75cf %define glibcversion 2.19.90 -%define glibcrelease 9%{?dist} +%define glibcrelease 10%{?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 10 2014 Siddhesh Poyarekar - 2.19.90-10 +- Sync with upstream master. + * Thu Apr 03 2014 Siddhesh Poyarekar - 2.19.90-9 - Sync with upstream master. diff --git a/sources b/sources index 9fd0389..4e5f97f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c7cf63e359a82e4e883f0a99acf4d20c glibc-2.19-257-gf6488e2b.tar.gz +997b3a71cbe5ee90e7cfddd14a14da14 glibc-2.19-269-ga4c75cf.tar.gz