rpms/glibc
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Sync with upstream master

Browse Source 
Fix up glibc-rh741105.patch so that it continues to apply correctly.
This commit is contained in:
Siddhesh Poyarekar 2014-04-10 21:40:30 +05:30
parent 3708995e5f
commit c899b490ba
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glibc-rh741105.patch
View File

@ -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"); = N_("ELF load command address/offset not properly aligned");
goto call_lose; 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 + /* If the segment requires zeroing of part of its last
+ page, we'll crash when accessing the unmapped page. + 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; + goto call_lose;
+ } + }
c = &loadcmds[nloadcmds++]; struct loadcmd *c = &loadcmds[nloadcmds++];
c->mapstart = ph->p_vaddr & ~(GLRO(dl_pagesize) - 1); c->mapstart = ph->p_vaddr & ~(GLRO(dl_pagesize) - 1);
Only in b/elf: dl-load.c.orig

7
glibc.spec
View File

@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.19-257-gf6488e2b %define glibcsrcdir glibc-2.19-269-ga4c75cf
%define glibcversion 2.19.90 %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 # Pre-release tarballs are pulled in from git using a command that is
# effectively: # effectively:
# #
@ -1639,6 +1639,9 @@ rm -f *.filelist*
%endif %endif
%changelog %changelog
* Thu Apr 10 2014 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.19.90-10
- Sync with upstream master.
* Thu Apr 03 2014 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.19.90-9 * Thu Apr 03 2014 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.19.90-9
- Sync with upstream master. - Sync with upstream master.

2
sources
View File

@ -1 +1 @@
c7cf63e359a82e4e883f0a99acf4d20c glibc-2.19-257-gf6488e2b.tar.gz 997b3a71cbe5ee90e7cfddd14a14da14 glibc-2.19-269-ga4c75cf.tar.gz