summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlistair Francis <Alistair.Francis@wdc.com>2019-02-25 21:39:45 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-26 23:04:31 +0000
commitce9a6606d7791320502383f92cf4d9935f09a2b3 (patch)
tree40d64b7056bb5a1fd16b96737a999d25a9068e5b
parentc1f4e0169780502068eec472f3d9c76f7b496172 (diff)
downloadpoky-ce9a6606d7791320502383f92cf4d9935f09a2b3.tar.gz
glibc: Remove ChangeLog diff from patch
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>
-rw-r--r--meta/recipes-core/glibc/glibc/0001-x86-64-memcmp-Use-unsigned-Jcc-instructions-on-size-.patch21
1 files changed, 1 insertions, 20 deletions
diff --git a/meta/recipes-core/glibc/glibc/0001-x86-64-memcmp-Use-unsigned-Jcc-instructions-on-size-.patch b/meta/recipes-core/glibc/glibc/0001-x86-64-memcmp-Use-unsigned-Jcc-instructions-on-size-.patch
index 1c625f63c7..1a343149c0 100644
--- a/meta/recipes-core/glibc/glibc/0001-x86-64-memcmp-Use-unsigned-Jcc-instructions-on-size-.patch
+++ b/meta/recipes-core/glibc/glibc/0001-x86-64-memcmp-Use-unsigned-Jcc-instructions-on-size-.patch
@@ -21,33 +21,14 @@ Tested on x86-64 and x32, with and without --disable-multi-arch.
21CVE: CVE-2019-7309 21CVE: CVE-2019-7309
22Upstream-Status: Backport 22Upstream-Status: Backport
23Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> 23Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
24Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
24--- 25---
25 ChangeLog | 11 ++++
26 sysdeps/x86_64/memcmp.S | 20 +++--- 26 sysdeps/x86_64/memcmp.S | 20 +++---
27 sysdeps/x86_64/x32/Makefile | 3 +- 27 sysdeps/x86_64/x32/Makefile | 3 +-
28 sysdeps/x86_64/x32/tst-size_t-memcmp-2.c | 79 ++++++++++++++++++++++++ 28 sysdeps/x86_64/x32/tst-size_t-memcmp-2.c | 79 ++++++++++++++++++++++++
29 5 files changed, 111 insertions(+), 10 deletions(-) 29 5 files changed, 111 insertions(+), 10 deletions(-)
30 create mode 100644 sysdeps/x86_64/x32/tst-size_t-memcmp-2.c 30 create mode 100644 sysdeps/x86_64/x32/tst-size_t-memcmp-2.c
31 31
32diff --git a/ChangeLog b/ChangeLog
33index 29bc4451ef..a0dcdac323 100644
34--- a/ChangeLog
35+++ b/ChangeLog
36@@ -1,3 +1,14 @@
37+2019-02-04 H.J. Lu <hongjiu.lu@intel.com>
38+
39+ [BZ #24155]
40+ CVE-2019-7309
41+ * NEWS: Updated for CVE-2019-7309.
42+ * sysdeps/x86_64/memcmp.S: Use RDX_LP for size. Clear the
43+ upper 32 bits of RDX register for x32. Use unsigned Jcc
44+ instructions, instead of signed.
45+ * sysdeps/x86_64/x32/Makefile (tests): Add tst-size_t-memcmp-2.
46+ * sysdeps/x86_64/x32/tst-size_t-memcmp-2.c: New test.
47+
48 2019-01-31 Carlos O'Donell <carlos@redhat.com>
49 Torvald Riegel <triegel@redhat.com>
50 Rik Prohaska <prohaska7@gmail.com>
51diff --git a/sysdeps/x86_64/memcmp.S b/sysdeps/x86_64/memcmp.S 32diff --git a/sysdeps/x86_64/memcmp.S b/sysdeps/x86_64/memcmp.S
52index 1fc487caa5..1322bb3b92 100644 33index 1fc487caa5..1322bb3b92 100644
53--- a/sysdeps/x86_64/memcmp.S 34--- a/sysdeps/x86_64/memcmp.S