From: Alistair Francis Date: Mon, 25 Feb 2019 21:39:45 +0000 (+0000) Subject: glibc: Remove ChangeLog diff from patch X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~15217 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=695d79af1edcc76a01055b01922f0d106c8291ca;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git glibc: Remove ChangeLog diff from patch To avoid conflicts with other forks of glibc remove the diff from the ChangeLog. Signed-off-by: Alistair Francis Signed-off-by: Richard Purdie --- 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 1c625f63c77..1a343149c0d 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. CVE: CVE-2019-7309 Upstream-Status: Backport Signed-off-by: Zhixiong Chi +Signed-off-by: Alistair Francis --- - ChangeLog | 11 ++++ sysdeps/x86_64/memcmp.S | 20 +++--- sysdeps/x86_64/x32/Makefile | 3 +- sysdeps/x86_64/x32/tst-size_t-memcmp-2.c | 79 ++++++++++++++++++++++++ 5 files changed, 111 insertions(+), 10 deletions(-) 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 -+ -+ [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 - Torvald Riegel - Rik Prohaska diff --git a/sysdeps/x86_64/memcmp.S b/sysdeps/x86_64/memcmp.S index 1fc487caa5..1322bb3b92 100644 --- a/sysdeps/x86_64/memcmp.S