mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-29 07:36:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

glibc: Remove ChangeLog diff from patch

Browse Source 
To avoid conflicts with other forks of glibc remove the diff from the
ChangeLog.

(From OE-Core rev: 695d79af1edcc76a01055b01922f0d106c8291ca)

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alistair Francis
2019-02-25 21:39:45 +00:00
committed by Richard Purdie
parent c1f4e01697
commit ce9a6606d7
1 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
meta/recipes-core/glibc/glibc/0001-x86-64-memcmp-Use-unsigned-Jcc-instructions-on-size-.patch
View File

@@ -21,33 +21,14 @@ Tested on x86-64 and x32, with and without --disable-multi-arch.
CVE: CVE-2019-7309 CVE: CVE-2019-7309
Upstream-Status: Backport Upstream-Status: Backport
Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
--- ---
ChangeLog | 11 ++++
sysdeps/x86_64/memcmp.S | 20 +++--- sysdeps/x86_64/memcmp.S | 20 +++---
sysdeps/x86_64/x32/Makefile | 3 +- sysdeps/x86_64/x32/Makefile | 3 +-
sysdeps/x86_64/x32/tst-size_t-memcmp-2.c | 79 ++++++++++++++++++++++++ sysdeps/x86_64/x32/tst-size_t-memcmp-2.c | 79 ++++++++++++++++++++++++
5 files changed, 111 insertions(+), 10 deletions(-) 5 files changed, 111 insertions(+), 10 deletions(-)
create mode 100644 sysdeps/x86_64/x32/tst-size_t-memcmp-2.c create mode 100644 sysdeps/x86_64/x32/tst-size_t-memcmp-2.c
diff --git a/ChangeLog b/ChangeLog
index 29bc4451ef..a0dcdac323 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2019-02-04 H.J. Lu <hongjiu.lu@intel.com>
+
+ [BZ #24155]
+ CVE-2019-7309
+ * NEWS: Updated for CVE-2019-7309.
+ * sysdeps/x86_64/memcmp.S: Use RDX_LP for size. Clear the
+ upper 32 bits of RDX register for x32. Use unsigned Jcc
+ instructions, instead of signed.
+ * sysdeps/x86_64/x32/Makefile (tests): Add tst-size_t-memcmp-2.
+ * sysdeps/x86_64/x32/tst-size_t-memcmp-2.c: New test.
+
2019-01-31 Carlos O'Donell <carlos@redhat.com>
Torvald Riegel <triegel@redhat.com>
Rik Prohaska <prohaska7@gmail.com>
diff --git a/sysdeps/x86_64/memcmp.S b/sysdeps/x86_64/memcmp.S diff --git a/sysdeps/x86_64/memcmp.S b/sysdeps/x86_64/memcmp.S
index 1fc487caa5..1322bb3b92 100644 index 1fc487caa5..1322bb3b92 100644
--- a/sysdeps/x86_64/memcmp.S --- a/sysdeps/x86_64/memcmp.S