[glibc/f16] - Temporarily add patch2 to fix #745739. Patch is upstream so can be removed at next update from m
Richard W.M. Jones
rjones at fedoraproject.org
Fri Oct 14 13:11:18 UTC 2011
commit cf6224207fd36b9c908f7af1df1b23512b682d32
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Fri Oct 14 13:19:09 2011 +0100
- Temporarily add patch2 to fix #745739.
Patch is upstream so can be removed at next update from master.
...Check-for-zero-size-in-memrchr-for-x86_64.patch | 27 ++++++++++++++++++++
glibc.spec | 8 +++++-
2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/0001-Check-for-zero-size-in-memrchr-for-x86_64.patch b/0001-Check-for-zero-size-in-memrchr-for-x86_64.patch
new file mode 100644
index 0000000..60cf20f
--- /dev/null
+++ b/0001-Check-for-zero-size-in-memrchr-for-x86_64.patch
@@ -0,0 +1,27 @@
+From 81dcc7fb74a766f970800b9975e85b5fe7f6ea38 Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab at redhat.com>
+Date: Thu, 13 Oct 2011 13:33:58 +0200
+Subject: [PATCH] Check for zero size in memrchr for x86_64
+
+---
+ ChangeLog | 2 ++
+ sysdeps/x86_64/memrchr.S | 3 +++
+ 2 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/sysdeps/x86_64/memrchr.S b/sysdeps/x86_64/memrchr.S
+index 81b7a1c..70adca3 100644
+--- a/sysdeps/x86_64/memrchr.S
++++ b/sysdeps/x86_64/memrchr.S
+@@ -282,6 +282,9 @@ L(return_null):
+
+ .p2align 4
+ L(length_less16_offset0):
++ test %edx, %edx
++ jz L(return_null)
++
+ mov %dl, %cl
+ pcmpeqb (%rdi), %xmm1
+
+--
+1.7.6
+
diff --git a/glibc.spec b/glibc.spec
index 6049519..66d130c 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -28,7 +28,7 @@
Summary: The GNU libc libraries
Name: glibc
Version: %{glibcversion}
-Release: 11
+Release: 12
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
# Things that are linked directly into dynamically linked programs
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -42,6 +42,7 @@ Source1: %{?glibc_release_url}%{glibcportsdir}.tar.xz
Source2: %{glibcsrcdir}-fedora.tar.xz
Patch0: %{name}-fedora.patch
Patch1: %{name}-ia64-lib64.patch
+Patch2: 0001-Check-for-zero-size-in-memrchr-for-x86_64.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Obsoletes: glibc-profile < 2.4
Obsoletes: nss_db
@@ -260,6 +261,7 @@ rm -rf %{glibcportsdir}
%patch1 -p1
%endif
%endif
+%patch2 -p1
# A lot of programs still misuse memcpy when they have to use
# memmove. The memcpy implementation below is not tolerant at
@@ -1112,6 +1114,10 @@ rm -f *.filelist*
%endif
%changelog
+* Fri Oct 14 2011 Richard W.M. Jones <rjones at redhat.com> - 2.14.90-12
+- Temporarily add patch2 to fix #745739.
+ Patch is upstream so can be removed at next update from master.
+
* Tue Oct 11 2011 Andreas Schwab <schwab at redhat.com> - 2.14.90-11
- Update from master
- Clean up locarchive mmap reservation code
More information about the scm-commits
mailing list