summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMuminul Islam <misla011@fiu.edu>2019-10-07 21:50:40 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-15 15:54:00 +0100
commit7e20a2238c0ca9cb83f74a60986c3d4a10ac7b48 (patch)
tree8408aa7c74d2622e81c06b7c2e7fe25d80f0df4d
parent01d107f5c14811e52a316fea5b537dc8c4b9dc7a (diff)
downloadpoky-7e20a2238c0ca9cb83f74a60986c3d4a10ac7b48.tar.gz
glibc: Security fix for cve <CVE-2019-6488, CVE-2019-7309>
(From OE-Core rev: d68441ed80fd43f091baf01bfdb47c3ec010c662) Signed-off-by: Muminul Islam <muislam@microsoft.com> CVE: CVE-2019-6488, CVE-2019-7309 Upstream-Status: Backport Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-core/glibc/glibc/CVE-2019-6488.patch274
-rw-r--r--meta/recipes-core/glibc/glibc/CVE-2019-7309.patch207
-rw-r--r--meta/recipes-core/glibc/glibc_2.28.bb2
3 files changed, 483 insertions, 0 deletions
diff --git a/meta/recipes-core/glibc/glibc/CVE-2019-6488.patch b/meta/recipes-core/glibc/glibc/CVE-2019-6488.patch
new file mode 100644
index 0000000000..fa423754d4
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc/CVE-2019-6488.patch
@@ -0,0 +1,274 @@
1From 718016100d889a986c536b595bf6ec0d6ab4b90e Mon Sep 17 00:00:00 2001
2From: "H.J. Lu" <hjl.tools@gmail.com>
3Date: Fri, 1 Feb 2019 12:17:09 -0800
4Subject: [PATCH] x86-64 memchr/wmemchr: Properly handle the length parameter
5 [BZ #24097]
6Reply-To: muislam@microsoft.com
7
8On x32, the size_t parameter may be passed in the lower 32 bits of a
964-bit register with the non-zero upper 32 bits. The string/memory
10functions written in assembly can only use the lower 32 bits of a
1164-bit register as length or must clear the upper 32 bits before using
12the full 64-bit register for length.
13
14This pach fixes memchr/wmemchr for x32. Tested on x86-64 and x32. On
15x86-64, libc.so is the same with and withou the fix.
16
17 [BZ #24097]
18 CVE-2019-6488
19 * sysdeps/x86_64/memchr.S: Use RDX_LP for length. Clear the
20 upper 32 bits of RDX register.
21 * sysdeps/x86_64/multiarch/memchr-avx2.S: Likewise.
22 * sysdeps/x86_64/x32/Makefile (tests): Add tst-size_t-memchr and
23 tst-size_t-wmemchr.
24 * sysdeps/x86_64/x32/test-size_t.h: New file.
25 * sysdeps/x86_64/x32/tst-size_t-memchr.c: Likewise.
26 * sysdeps/x86_64/x32/tst-size_t-wmemchr.c: Likewise.
27
28(cherry picked from commit 97700a34f36721b11a754cf37a1cc40695ece1fd)
29
30CVE: CVE-2019-6488
31
32Upstream-Status: Backport
33
34Signed-off-by: Muminul Islam <muislam@microsoft.com>
35---
36 NEWS | 1 -
37 sysdeps/x86_64/memchr.S | 10 ++--
38 sysdeps/x86_64/multiarch/memchr-avx2.S | 8 ++-
39 sysdeps/x86_64/x32/Makefile | 8 +++
40 sysdeps/x86_64/x32/test-size_t.h | 35 ++++++++++++
41 sysdeps/x86_64/x32/tst-size_t-memchr.c | 72 +++++++++++++++++++++++++
42 sysdeps/x86_64/x32/tst-size_t-wmemchr.c | 20 +++++++
43 7 files changed, 148 insertions(+), 6 deletions(-)
44 create mode 100644 sysdeps/x86_64/x32/test-size_t.h
45 create mode 100644 sysdeps/x86_64/x32/tst-size_t-memchr.c
46 create mode 100644 sysdeps/x86_64/x32/tst-size_t-wmemchr.c
47
48diff --git a/NEWS b/NEWS
49index fd14941128..b158973a30 100644
50--- a/NEWS
51+++ b/NEWS
52@@ -17,7 +17,6 @@ The following bugs are resolved with this release:
53 [23606] Missing ENDBR32 in sysdeps/i386/start.S
54 [23679] gethostid: Missing NULL check for gethostbyname_r result
55 [23717] Fix stack overflow in stdlib/tst-setcontext9
56-
57
58 Version 2.28
59
60diff --git a/sysdeps/x86_64/memchr.S b/sysdeps/x86_64/memchr.S
61index feef5d4f24..cb320257a2 100644
62--- a/sysdeps/x86_64/memchr.S
63+++ b/sysdeps/x86_64/memchr.S
64@@ -34,12 +34,16 @@ ENTRY(MEMCHR)
65 mov %edi, %ecx
66
67 #ifdef USE_AS_WMEMCHR
68- test %rdx, %rdx
69+ test %RDX_LP, %RDX_LP
70 jz L(return_null)
71- shl $2, %rdx
72+ shl $2, %RDX_LP
73 #else
74+# ifdef __ILP32__
75+ /* Clear the upper 32 bits. */
76+ movl %edx, %edx
77+# endif
78 punpcklbw %xmm1, %xmm1
79- test %rdx, %rdx
80+ test %RDX_LP, %RDX_LP
81 jz L(return_null)
82 punpcklbw %xmm1, %xmm1
83 #endif
84diff --git a/sysdeps/x86_64/multiarch/memchr-avx2.S b/sysdeps/x86_64/multiarch/memchr-avx2.S
85index 5f5e772554..c81da19bf0 100644
86--- a/sysdeps/x86_64/multiarch/memchr-avx2.S
87+++ b/sysdeps/x86_64/multiarch/memchr-avx2.S
88@@ -40,16 +40,20 @@
89 ENTRY (MEMCHR)
90 # ifndef USE_AS_RAWMEMCHR
91 /* Check for zero length. */
92- testq %rdx, %rdx
93+ test %RDX_LP, %RDX_LP
94 jz L(null)
95 # endif
96 movl %edi, %ecx
97 /* Broadcast CHAR to YMM0. */
98 vmovd %esi, %xmm0
99 # ifdef USE_AS_WMEMCHR
100- shl $2, %rdx
101+ shl $2, %RDX_LP
102 vpbroadcastd %xmm0, %ymm0
103 # else
104+# ifdef __ILP32__
105+ /* Clear the upper 32 bits. */
106+ movl %edx, %edx
107+# endif
108 vpbroadcastb %xmm0, %ymm0
109 # endif
110 /* Check if we may cross page boundary with one vector load. */
111diff --git a/sysdeps/x86_64/x32/Makefile b/sysdeps/x86_64/x32/Makefile
112index f2ebc24fb0..7d528889c6 100644
113--- a/sysdeps/x86_64/x32/Makefile
114+++ b/sysdeps/x86_64/x32/Makefile
115@@ -4,3 +4,11 @@ ifeq ($(subdir),math)
116 # 64-bit llround. Add -fno-builtin-lround to silence the compiler.
117 CFLAGS-s_llround.c += -fno-builtin-lround
118 endif
119+
120+ifeq ($(subdir),string)
121+tests += tst-size_t-memchr
122+endif
123+
124+ifeq ($(subdir),wcsmbs)
125+tests += tst-size_t-wmemchr
126+endif
127diff --git a/sysdeps/x86_64/x32/test-size_t.h b/sysdeps/x86_64/x32/test-size_t.h
128new file mode 100644
129index 0000000000..78a940863e
130--- /dev/null
131+++ b/sysdeps/x86_64/x32/test-size_t.h
132@@ -0,0 +1,35 @@
133+/* Test string/memory functions with size_t in the lower 32 bits of
134+ 64-bit register.
135+ Copyright (C) 2019 Free Software Foundation, Inc.
136+ This file is part of the GNU C Library.
137+
138+ The GNU C Library is free software; you can redistribute it and/or
139+ modify it under the terms of the GNU Lesser General Public
140+ License as published by the Free Software Foundation; either
141+ version 2.1 of the License, or (at your option) any later version.
142+
143+ The GNU C Library is distributed in the hope that it will be useful,
144+ but WITHOUT ANY WARRANTY; without even the implied warranty of
145+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
146+ Lesser General Public License for more details.
147+
148+ You should have received a copy of the GNU Lesser General Public
149+ License along with the GNU C Library; if not, see
150+ <http://www.gnu.org/licenses/>. */
151+
152+#define TEST_MAIN
153+#include <string/test-string.h>
154+
155+/* On x32, parameter_t may be passed in a 64-bit register with the LEN
156+ field in the lower 32 bits. When the LEN field of 64-bit register
157+ is passed to string/memory function as the size_t parameter, only
158+ the lower 32 bits can be used. */
159+typedef struct
160+{
161+ union
162+ {
163+ size_t len;
164+ void (*fn) (void);
165+ };
166+ void *p;
167+} parameter_t;
168diff --git a/sysdeps/x86_64/x32/tst-size_t-memchr.c b/sysdeps/x86_64/x32/tst-size_t-memchr.c
169new file mode 100644
170index 0000000000..29a3daf102
171--- /dev/null
172+++ b/sysdeps/x86_64/x32/tst-size_t-memchr.c
173@@ -0,0 +1,72 @@
174+/* Test memchr with size_t in the lower 32 bits of 64-bit register.
175+ Copyright (C) 2019 Free Software Foundation, Inc.
176+ This file is part of the GNU C Library.
177+
178+ The GNU C Library is free software; you can redistribute it and/or
179+ modify it under the terms of the GNU Lesser General Public
180+ License as published by the Free Software Foundation; either
181+ version 2.1 of the License, or (at your option) any later version.
182+
183+ The GNU C Library is distributed in the hope that it will be useful,
184+ but WITHOUT ANY WARRANTY; without even the implied warranty of
185+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
186+ Lesser General Public License for more details.
187+
188+ You should have received a copy of the GNU Lesser General Public
189+ License along with the GNU C Library; if not, see
190+ <http://www.gnu.org/licenses/>. */
191+
192+#ifndef WIDE
193+# define TEST_NAME "memchr"
194+#else
195+# define TEST_NAME "wmemchr"
196+#endif /* WIDE */
197+#include "test-size_t.h"
198+
199+#ifndef WIDE
200+# define MEMCHR memchr
201+# define CHAR char
202+# define UCHAR unsigned char
203+#else
204+# include <wchar.h>
205+# define MEMCHR wmemchr
206+# define CHAR wchar_t
207+# define UCHAR wchar_t
208+#endif /* WIDE */
209+
210+IMPL (MEMCHR, 1)
211+
212+typedef CHAR * (*proto_t) (const CHAR*, int, size_t);
213+
214+static CHAR *
215+__attribute__ ((noinline, noclone))
216+do_memchr (parameter_t a, parameter_t b)
217+{
218+ return CALL (&b, a.p, (uintptr_t) b.p, a.len);
219+}
220+
221+static int
222+test_main (void)
223+{
224+ test_init ();
225+
226+ parameter_t src = { { page_size / sizeof (CHAR) }, buf2 };
227+ parameter_t c = { { 0 }, (void *) (uintptr_t) 0x12 };
228+
229+ int ret = 0;
230+ FOR_EACH_IMPL (impl, 0)
231+ {
232+ c.fn = impl->fn;
233+ CHAR *res = do_memchr (src, c);
234+ if (res)
235+ {
236+ error (0, 0, "Wrong result in function %s: %p != NULL",
237+ impl->name, res);
238+ ret = 1;
239+ }
240+ }
241+
242+ return ret ? EXIT_FAILURE : EXIT_SUCCESS;
243+}
244+
245+#include <support/test-driver.c>
246diff --git a/sysdeps/x86_64/x32/tst-size_t-wmemchr.c b/sysdeps/x86_64/x32/tst-size_t-wmemchr.c
247new file mode 100644
248index 0000000000..877801d646
249--- /dev/null
250+++ b/sysdeps/x86_64/x32/tst-size_t-wmemchr.c
251@@ -0,0 +1,20 @@
252+/* Test wmemchr with size_t in the lower 32 bits of 64-bit register.
253+ Copyright (C) 2019 Free Software Foundation, Inc.
254+ This file is part of the GNU C Library.
255+
256+ The GNU C Library is free software; you can redistribute it and/or
257+ modify it under the terms of the GNU Lesser General Public
258+ License as published by the Free Software Foundation; either
259+ version 2.1 of the License, or (at your option) any later version.
260+
261+ The GNU C Library is distributed in the hope that it will be useful,
262+ but WITHOUT ANY WARRANTY; without even the implied warranty of
263+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
264+ Lesser General Public License for more details.
265+
266+ You should have received a copy of the GNU Lesser General Public
267+ License along with the GNU C Library; if not, see
268+ <http://www.gnu.org/licenses/>. */
269+
270+#define WIDE 1
271+#include "tst-size_t-memchr.c"
272--
2732.23.0
274
diff --git a/meta/recipes-core/glibc/glibc/CVE-2019-7309.patch b/meta/recipes-core/glibc/glibc/CVE-2019-7309.patch
new file mode 100644
index 0000000000..04963c29e4
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc/CVE-2019-7309.patch
@@ -0,0 +1,207 @@
1From af7f46c45a60e6df754fb6258b546917e61ae6f1 Mon Sep 17 00:00:00 2001
2From: "H.J. Lu" <hjl.tools@gmail.com>
3Date: Mon, 4 Feb 2019 08:55:52 -0800
4Subject: [PATCH] x86-64 memcmp: Use unsigned Jcc instructions on size [BZ
5 #24155]
6Reply-To: muislam@microsoft.com
7
8Since the size argument is unsigned. we should use unsigned Jcc
9instructions, instead of signed, to check size.
10
11Tested on x86-64 and x32, with and without --disable-multi-arch.
12
13 [BZ #24155]
14 CVE-2019-7309
15 * NEWS: Updated for CVE-2019-7309.
16 * sysdeps/x86_64/memcmp.S: Use RDX_LP for size. Clear the
17 upper 32 bits of RDX register for x32. Use unsigned Jcc
18 instructions, instead of signed.
19 * sysdeps/x86_64/x32/Makefile (tests): Add tst-size_t-memcmp-2.
20 * sysdeps/x86_64/x32/tst-size_t-memcmp-2.c: New test.
21
22(cherry picked from commit 3f635fb43389b54f682fc9ed2acc0b2aaf4a923d)
23
24Signed-off-by: Muminul Islam <muislam@microsoft.com>
25
26CVE: CVE-2019-7309
27
28Upstream-Status: Backport
29---
30 sysdeps/x86_64/memcmp.S | 20 +++---
31 sysdeps/x86_64/x32/Makefile | 2 +-
32 sysdeps/x86_64/x32/tst-size_t-memcmp-2.c | 79 ++++++++++++++++++++++++
33 3 files changed, 92 insertions(+), 9 deletions(-)
34 create mode 100644 sysdeps/x86_64/x32/tst-size_t-memcmp-2.c
35
36diff --git a/sysdeps/x86_64/memcmp.S b/sysdeps/x86_64/memcmp.S
37index bcb4a2e88d..45918d375a 100644
38--- a/sysdeps/x86_64/memcmp.S
39+++ b/sysdeps/x86_64/memcmp.S
40@@ -21,14 +21,18 @@
41
42 .text
43 ENTRY (memcmp)
44- test %rdx, %rdx
45+#ifdef __ILP32__
46+ /* Clear the upper 32 bits. */
47+ movl %edx, %edx
48+#endif
49+ test %RDX_LP, %RDX_LP
50 jz L(finz)
51 cmpq $1, %rdx
52- jle L(finr1b)
53+ jbe L(finr1b)
54 subq %rdi, %rsi
55 movq %rdx, %r10
56 cmpq $32, %r10
57- jge L(gt32)
58+ jae L(gt32)
59 /* Handle small chunks and last block of less than 32 bytes. */
60 L(small):
61 testq $1, %r10
62@@ -156,7 +160,7 @@ L(A32):
63 movq %r11, %r10
64 andq $-32, %r10
65 cmpq %r10, %rdi
66- jge L(mt16)
67+ jae L(mt16)
68 /* Pre-unroll to be ready for unrolled 64B loop. */
69 testq $32, %rdi
70 jz L(A64)
71@@ -178,7 +182,7 @@ L(A64):
72 movq %r11, %r10
73 andq $-64, %r10
74 cmpq %r10, %rdi
75- jge L(mt32)
76+ jae L(mt32)
77
78 L(A64main):
79 movdqu (%rdi,%rsi), %xmm0
80@@ -216,7 +220,7 @@ L(mt32):
81 movq %r11, %r10
82 andq $-32, %r10
83 cmpq %r10, %rdi
84- jge L(mt16)
85+ jae L(mt16)
86
87 L(A32main):
88 movdqu (%rdi,%rsi), %xmm0
89@@ -254,7 +258,7 @@ L(ATR):
90 movq %r11, %r10
91 andq $-32, %r10
92 cmpq %r10, %rdi
93- jge L(mt16)
94+ jae L(mt16)
95 testq $16, %rdi
96 jz L(ATR32)
97
98@@ -325,7 +329,7 @@ L(ATR64main):
99 movq %r11, %r10
100 andq $-32, %r10
101 cmpq %r10, %rdi
102- jge L(mt16)
103+ jae L(mt16)
104
105 L(ATR32res):
106 movdqa (%rdi,%rsi), %xmm0
107diff --git a/sysdeps/x86_64/x32/Makefile b/sysdeps/x86_64/x32/Makefile
108index 7d528889c6..c9850beeb5 100644
109--- a/sysdeps/x86_64/x32/Makefile
110+++ b/sysdeps/x86_64/x32/Makefile
111@@ -6,7 +6,7 @@ CFLAGS-s_llround.c += -fno-builtin-lround
112 endif
113
114 ifeq ($(subdir),string)
115-tests += tst-size_t-memchr
116+tests += tst-size_t-memchr tst-size_t-memcmp-2
117 endif
118
119 ifeq ($(subdir),wcsmbs)
120diff --git a/sysdeps/x86_64/x32/tst-size_t-memcmp-2.c b/sysdeps/x86_64/x32/tst-size_t-memcmp-2.c
121new file mode 100644
122index 0000000000..d8ae1a0813
123--- /dev/null
124+++ b/sysdeps/x86_64/x32/tst-size_t-memcmp-2.c
125@@ -0,0 +1,79 @@
126+/* Test memcmp with size_t in the lower 32 bits of 64-bit register.
127+ Copyright (C) 2019 Free Software Foundation, Inc.
128+ This file is part of the GNU C Library.
129+
130+ The GNU C Library is free software; you can redistribute it and/or
131+ modify it under the terms of the GNU Lesser General Public
132+ License as published by the Free Software Foundation; either
133+ version 2.1 of the License, or (at your option) any later version.
134+
135+ The GNU C Library is distributed in the hope that it will be useful,
136+ but WITHOUT ANY WARRANTY; without even the implied warranty of
137+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
138+ Lesser General Public License for more details.
139+
140+ You should have received a copy of the GNU Lesser General Public
141+ License along with the GNU C Library; if not, see
142+ <http://www.gnu.org/licenses/>. */
143+
144+#define TEST_MAIN
145+#ifdef WIDE
146+# define TEST_NAME "wmemcmp"
147+#else
148+# define TEST_NAME "memcmp"
149+#endif
150+
151+#include "test-size_t.h"
152+
153+#ifdef WIDE
154+# include <inttypes.h>
155+# include <wchar.h>
156+
157+# define MEMCMP wmemcmp
158+# define CHAR wchar_t
159+#else
160+# define MEMCMP memcmp
161+# define CHAR char
162+#endif
163+
164+IMPL (MEMCMP, 1)
165+
166+typedef int (*proto_t) (const CHAR *, const CHAR *, size_t);
167+
168+static int
169+__attribute__ ((noinline, noclone))
170+do_memcmp (parameter_t a, parameter_t b)
171+{
172+ return CALL (&b, a.p, b.p, a.len);
173+}
174+
175+static int
176+test_main (void)
177+{
178+ test_init ();
179+
180+ parameter_t dest = { { page_size / sizeof (CHAR) }, buf1 };
181+ parameter_t src = { { 0 }, buf2 };
182+
183+ memcpy (buf1, buf2, page_size);
184+
185+ CHAR *p = (CHAR *) buf1;
186+ p[page_size / sizeof (CHAR) - 1] = (CHAR) 1;
187+
188+ int ret = 0;
189+ FOR_EACH_IMPL (impl, 0)
190+ {
191+ src.fn = impl->fn;
192+ int res = do_memcmp (dest, src);
193+ if (res >= 0)
194+ {
195+ error (0, 0, "Wrong result in function %s: %i >= 0",
196+ impl->name, res);
197+ ret = 1;
198+ }
199+ }
200+
201+ return ret ? EXIT_FAILURE : EXIT_SUCCESS;
202+}
203+
204+#include <support/test-driver.c>
205--
2062.23.0
207
diff --git a/meta/recipes-core/glibc/glibc_2.28.bb b/meta/recipes-core/glibc/glibc_2.28.bb
index 0839fa126d..4e6ee4dcab 100644
--- a/meta/recipes-core/glibc/glibc_2.28.bb
+++ b/meta/recipes-core/glibc/glibc_2.28.bb
@@ -50,6 +50,8 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
50 file://CVE-2019-9169.patch \ 50 file://CVE-2019-9169.patch \
51 file://CVE-2016-10739.patch \ 51 file://CVE-2016-10739.patch \
52 file://CVE-2018-19591.patch \ 52 file://CVE-2018-19591.patch \
53 file://CVE-2019-6488.patch \
54 file://CVE-2019-7309.patch \
53" 55"
54 56
55NATIVESDKFIXES ?= "" 57NATIVESDKFIXES ?= ""
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-24 12:36:25 +0000