summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2020-01-17 17:14:27 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-28 11:15:01 (GMT)
commitef2bec784ba91d7f7a2bfe5565cdc78727d2c77a (patch)
treeb32e63a165dbe275fec5efce8cb9ac0a586292a7
parenta2335757bac182de71417516afdc4ad66457a6cd (diff)
downloadpoky-ef2bec784ba91d7f7a2bfe5565cdc78727d2c77a.tar.gz
glibc: fix CVE-2019-19126
Backport from 2.30 stable branch and drop NEWS section. (From OE-Core rev: de04ec5dcf72d76f2e8274af4bcddf27cb02e544) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/glibc/glibc/CVE-2019-19126.patch32
-rw-r--r--meta/recipes-core/glibc/glibc_2.29.bb1
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-core/glibc/glibc/CVE-2019-19126.patch b/meta/recipes-core/glibc/glibc/CVE-2019-19126.patch
new file mode 100644
index 0000000..aead04c
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc/CVE-2019-19126.patch
@@ -0,0 +1,32 @@
1From 37c90e117310728a4ad1eb998c0bbe7d79c4a398 Mon Sep 17 00:00:00 2001
2From: =?utf8?q?Marcin=20Ko=C5=9Bcielnicki?= <mwk@0x04.net>
3Date: Thu, 21 Nov 2019 00:20:15 +0100
4Subject: [PATCH] rtld: Check __libc_enable_secure before honoring
5 LD_PREFER_MAP_32BIT_EXEC (CVE-2019-19126) [BZ #25204]
6
7The problem was introduced in glibc 2.23, in commit
8b9eb92ab05204df772eb4929eccd018637c9f3e9
9("Add Prefer_MAP_32BIT_EXEC to map executable pages with MAP_32BIT").
10
11(cherry picked from commit d5dfad4326fc683c813df1e37bbf5cf920591c8e)
12
13Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commit;h=37c90e117310728a4ad1eb998c0bbe7d79c4a398]
14CVE: CVE-2019-19126
15Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
16---
17diff --git a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
18index 975cbe2..df2cdfd 100644
19--- a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
20+++ b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
21@@ -31,7 +31,8 @@
22 environment variable, LD_PREFER_MAP_32BIT_EXEC. */
23 #define EXTRA_LD_ENVVARS \
24 case 21: \
25- if (memcmp (envline, "PREFER_MAP_32BIT_EXEC", 21) == 0) \
26+ if (!__libc_enable_secure \
27+ && memcmp (envline, "PREFER_MAP_32BIT_EXEC", 21) == 0) \
28 GLRO(dl_x86_cpu_features).feature[index_arch_Prefer_MAP_32BIT_EXEC] \
29 |= bit_arch_Prefer_MAP_32BIT_EXEC; \
30 break;
31--
322.9.3
diff --git a/meta/recipes-core/glibc/glibc_2.29.bb b/meta/recipes-core/glibc/glibc_2.29.bb
index c6b2caa..28af4d1 100644
--- a/meta/recipes-core/glibc/glibc_2.29.bb
+++ b/meta/recipes-core/glibc/glibc_2.29.bb
@@ -56,6 +56,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
56 file://0030-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch \ 56 file://0030-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch \
57 file://0001-x86-64-memcmp-Use-unsigned-Jcc-instructions-on-size-.patch \ 57 file://0001-x86-64-memcmp-Use-unsigned-Jcc-instructions-on-size-.patch \
58 file://CVE-2019-9169.patch \ 58 file://CVE-2019-9169.patch \
59 file://CVE-2019-19126.patch \
59" 60"
60 61
61S = "${WORKDIR}/git" 62S = "${WORKDIR}/git"