* [ZEUS][OE-core][PATCH] glibc: CVE-2020-1751
@ 2020-04-20 9:58 Zhixiong Chi
2020-04-21 2:31 ` akuster
0 siblings, 1 reply; 3+ messages in thread
From: Zhixiong Chi @ 2020-04-20 9:58 UTC (permalink / raw)
To: openembedded-core
Backport the CVE patch from upstream:
git://sourceware.org/git/glibc.git
commit d93769405996dfc11d216ddbe415946617b5a494
Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
---
.../glibc/glibc/CVE-2020-1751.patch | 70 +++++++++++++++++++
meta/recipes-core/glibc/glibc_2.30.bb | 1 +
2 files changed, 71 insertions(+)
create mode 100644 meta/recipes-core/glibc/glibc/CVE-2020-1751.patch
diff --git a/meta/recipes-core/glibc/glibc/CVE-2020-1751.patch b/meta/recipes-core/glibc/glibc/CVE-2020-1751.patch
new file mode 100644
index 0000000000..0ed92d50e9
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc/CVE-2020-1751.patch
@@ -0,0 +1,70 @@
+From d93769405996dfc11d216ddbe415946617b5a494 Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@suse.de>
+Date: Mon, 20 Jan 2020 17:01:50 +0100
+Subject: [PATCH] Fix array overflow in backtrace on PowerPC (bug 25423)
+
+When unwinding through a signal frame the backtrace function on PowerPC
+didn't check array bounds when storing the frame address. Fixes commit
+d400dcac5e ("PowerPC: fix backtrace to handle signal trampolines").
+
+CVE: CVE-2020-1751
+Upstream-Status: Backport [git://sourceware.org/git/glibc.git]
+Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
+---
+ debug/tst-backtrace5.c | 12 ++++++++++++
+ sysdeps/powerpc/powerpc32/backtrace.c | 2 ++
+ sysdeps/powerpc/powerpc64/backtrace.c | 2 ++
+ 3 files changed, 16 insertions(+)
+
+diff --git a/debug/tst-backtrace5.c b/debug/tst-backtrace5.c
+index e7ce410845..b2f46160e7 100644
+--- a/debug/tst-backtrace5.c
++++ b/debug/tst-backtrace5.c
+@@ -89,6 +89,18 @@ handle_signal (int signum)
+ }
+ /* Symbol names are not available for static functions, so we do not
+ check do_test. */
++
++ /* Check that backtrace does not return more than what fits in the array
++ (bug 25423). */
++ for (int j = 0; j < NUM_FUNCTIONS; j++)
++ {
++ n = backtrace (addresses, j);
++ if (n > j)
++ {
++ FAIL ();
++ return;
++ }
++ }
+ }
+
+ NO_INLINE int
+diff --git a/sysdeps/powerpc/powerpc32/backtrace.c b/sysdeps/powerpc/powerpc32/backtrace.c
+index 7c2d4726f8..d1456c8ae4 100644
+--- a/sysdeps/powerpc/powerpc32/backtrace.c
++++ b/sysdeps/powerpc/powerpc32/backtrace.c
+@@ -114,6 +114,8 @@ __backtrace (void **array, int size)
+ }
+ if (gregset)
+ {
++ if (count + 1 == size)
++ break;
+ array[++count] = (void*)((*gregset)[PT_NIP]);
+ current = (void*)((*gregset)[PT_R1]);
+ }
+diff --git a/sysdeps/powerpc/powerpc64/backtrace.c b/sysdeps/powerpc/powerpc64/backtrace.c
+index 65c260ab76..8a53a1088f 100644
+--- a/sysdeps/powerpc/powerpc64/backtrace.c
++++ b/sysdeps/powerpc/powerpc64/backtrace.c
+@@ -87,6 +87,8 @@ __backtrace (void **array, int size)
+ if (is_sigtramp_address (current->return_address))
+ {
+ struct signal_frame_64 *sigframe = (struct signal_frame_64*) current;
++ if (count + 1 == size)
++ break;
+ array[++count] = (void*) sigframe->uc.uc_mcontext.gp_regs[PT_NIP];
+ current = (void*) sigframe->uc.uc_mcontext.gp_regs[PT_R1];
+ }
+--
+2.23.0
+
diff --git a/meta/recipes-core/glibc/glibc_2.30.bb b/meta/recipes-core/glibc/glibc_2.30.bb
index c9e44a396d..84a6538ea1 100644
--- a/meta/recipes-core/glibc/glibc_2.30.bb
+++ b/meta/recipes-core/glibc/glibc_2.30.bb
@@ -43,6 +43,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
file://0028-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch \
file://CVE-2019-19126.patch \
file://CVE-2020-10029.patch \
+ file://CVE-2020-1751.patch \
"
S = "${WORKDIR}/git"
B = "${WORKDIR}/build-${TARGET_SYS}"
--
2.23.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [ZEUS][OE-core][PATCH] glibc: CVE-2020-1751
2020-04-20 9:58 [ZEUS][OE-core][PATCH] glibc: CVE-2020-1751 Zhixiong Chi
@ 2020-04-21 2:31 ` akuster
2020-04-21 4:21 ` Khem Raj
0 siblings, 1 reply; 3+ messages in thread
From: akuster @ 2020-04-21 2:31 UTC (permalink / raw)
To: Zhixiong Chi, openembedded-core
[-- Attachment #1: Type: text/plain, Size: 4100 bytes --]
On 4/20/20 2:58 AM, Zhixiong Chi wrote:
> Backport the CVE patch from upstream:
> git://sourceware.org/git/glibc.git
> commit d93769405996dfc11d216ddbe415946617b5a494
Is Dunfell or Master affected ?
- armin
>
> Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
> ---
> .../glibc/glibc/CVE-2020-1751.patch | 70 +++++++++++++++++++
> meta/recipes-core/glibc/glibc_2.30.bb | 1 +
> 2 files changed, 71 insertions(+)
> create mode 100644 meta/recipes-core/glibc/glibc/CVE-2020-1751.patch
>
> diff --git a/meta/recipes-core/glibc/glibc/CVE-2020-1751.patch b/meta/recipes-core/glibc/glibc/CVE-2020-1751.patch
> new file mode 100644
> index 0000000000..0ed92d50e9
> --- /dev/null
> +++ b/meta/recipes-core/glibc/glibc/CVE-2020-1751.patch
> @@ -0,0 +1,70 @@
> +From d93769405996dfc11d216ddbe415946617b5a494 Mon Sep 17 00:00:00 2001
> +From: Andreas Schwab <schwab@suse.de>
> +Date: Mon, 20 Jan 2020 17:01:50 +0100
> +Subject: [PATCH] Fix array overflow in backtrace on PowerPC (bug 25423)
> +
> +When unwinding through a signal frame the backtrace function on PowerPC
> +didn't check array bounds when storing the frame address. Fixes commit
> +d400dcac5e ("PowerPC: fix backtrace to handle signal trampolines").
> +
> +CVE: CVE-2020-1751
> +Upstream-Status: Backport [git://sourceware.org/git/glibc.git]
> +Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
> +---
> + debug/tst-backtrace5.c | 12 ++++++++++++
> + sysdeps/powerpc/powerpc32/backtrace.c | 2 ++
> + sysdeps/powerpc/powerpc64/backtrace.c | 2 ++
> + 3 files changed, 16 insertions(+)
> +
> +diff --git a/debug/tst-backtrace5.c b/debug/tst-backtrace5.c
> +index e7ce410845..b2f46160e7 100644
> +--- a/debug/tst-backtrace5.c
> ++++ b/debug/tst-backtrace5.c
> +@@ -89,6 +89,18 @@ handle_signal (int signum)
> + }
> + /* Symbol names are not available for static functions, so we do not
> + check do_test. */
> ++
> ++ /* Check that backtrace does not return more than what fits in the array
> ++ (bug 25423). */
> ++ for (int j = 0; j < NUM_FUNCTIONS; j++)
> ++ {
> ++ n = backtrace (addresses, j);
> ++ if (n > j)
> ++ {
> ++ FAIL ();
> ++ return;
> ++ }
> ++ }
> + }
> +
> + NO_INLINE int
> +diff --git a/sysdeps/powerpc/powerpc32/backtrace.c b/sysdeps/powerpc/powerpc32/backtrace.c
> +index 7c2d4726f8..d1456c8ae4 100644
> +--- a/sysdeps/powerpc/powerpc32/backtrace.c
> ++++ b/sysdeps/powerpc/powerpc32/backtrace.c
> +@@ -114,6 +114,8 @@ __backtrace (void **array, int size)
> + }
> + if (gregset)
> + {
> ++ if (count + 1 == size)
> ++ break;
> + array[++count] = (void*)((*gregset)[PT_NIP]);
> + current = (void*)((*gregset)[PT_R1]);
> + }
> +diff --git a/sysdeps/powerpc/powerpc64/backtrace.c b/sysdeps/powerpc/powerpc64/backtrace.c
> +index 65c260ab76..8a53a1088f 100644
> +--- a/sysdeps/powerpc/powerpc64/backtrace.c
> ++++ b/sysdeps/powerpc/powerpc64/backtrace.c
> +@@ -87,6 +87,8 @@ __backtrace (void **array, int size)
> + if (is_sigtramp_address (current->return_address))
> + {
> + struct signal_frame_64 *sigframe = (struct signal_frame_64*) current;
> ++ if (count + 1 == size)
> ++ break;
> + array[++count] = (void*) sigframe->uc.uc_mcontext.gp_regs[PT_NIP];
> + current = (void*) sigframe->uc.uc_mcontext.gp_regs[PT_R1];
> + }
> +--
> +2.23.0
> +
> diff --git a/meta/recipes-core/glibc/glibc_2.30.bb b/meta/recipes-core/glibc/glibc_2.30.bb
> index c9e44a396d..84a6538ea1 100644
> --- a/meta/recipes-core/glibc/glibc_2.30.bb
> +++ b/meta/recipes-core/glibc/glibc_2.30.bb
> @@ -43,6 +43,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
> file://0028-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch \
> file://CVE-2019-19126.patch \
> file://CVE-2020-10029.patch \
> + file://CVE-2020-1751.patch \
> "
> S = "${WORKDIR}/git"
> B = "${WORKDIR}/build-${TARGET_SYS}"
>
>
[-- Attachment #2: Type: text/html, Size: 5172 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [ZEUS][OE-core][PATCH] glibc: CVE-2020-1751
2020-04-21 2:31 ` akuster
@ 2020-04-21 4:21 ` Khem Raj
0 siblings, 0 replies; 3+ messages in thread
From: Khem Raj @ 2020-04-21 4:21 UTC (permalink / raw)
To: akuster; +Cc: Zhixiong Chi, openembedded-core
[-- Attachment #1: Type: text/plain, Size: 4310 bytes --]
On Mon, Apr 20, 2020 at 7:31 PM akuster <akuster808@gmail.com> wrote:
>
>
> On 4/20/20 2:58 AM, Zhixiong Chi wrote:
>
> Backport the CVE patch from upstream:
> git://sourceware.org/git/glibc.git
> commit d93769405996dfc11d216ddbe415946617b5a494
>
>
> Is Dunfell or Master affected ?
>
It’s already in glibc 2.31 iirc
> - armin
>
> Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> <zhixiong.chi@windriver.com>
> ---
> .../glibc/glibc/CVE-2020-1751.patch | 70 +++++++++++++++++++
> meta/recipes-core/glibc/glibc_2.30.bb | 1 +
> 2 files changed, 71 insertions(+)
> create mode 100644 meta/recipes-core/glibc/glibc/CVE-2020-1751.patch
>
> diff --git a/meta/recipes-core/glibc/glibc/CVE-2020-1751.patch b/meta/recipes-core/glibc/glibc/CVE-2020-1751.patch
> new file mode 100644
> index 0000000000..0ed92d50e9
> --- /dev/null
> +++ b/meta/recipes-core/glibc/glibc/CVE-2020-1751.patch
> @@ -0,0 +1,70 @@
> +From d93769405996dfc11d216ddbe415946617b5a494 Mon Sep 17 00:00:00 2001
> +From: Andreas Schwab <schwab@suse.de> <schwab@suse.de>
> +Date: Mon, 20 Jan 2020 17:01:50 +0100
> +Subject: [PATCH] Fix array overflow in backtrace on PowerPC (bug 25423)
> +
> +When unwinding through a signal frame the backtrace function on PowerPC
> +didn't check array bounds when storing the frame address. Fixes commit
> +d400dcac5e ("PowerPC: fix backtrace to handle signal trampolines").
> +
> +CVE: CVE-2020-1751
> +Upstream-Status: Backport [git://sourceware.org/git/glibc.git]
> +Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> <zhixiong.chi@windriver.com>
> +---
> + debug/tst-backtrace5.c | 12 ++++++++++++
> + sysdeps/powerpc/powerpc32/backtrace.c | 2 ++
> + sysdeps/powerpc/powerpc64/backtrace.c | 2 ++
> + 3 files changed, 16 insertions(+)
> +
> +diff --git a/debug/tst-backtrace5.c b/debug/tst-backtrace5.c
> +index e7ce410845..b2f46160e7 100644
> +--- a/debug/tst-backtrace5.c
> ++++ b/debug/tst-backtrace5.c
> +@@ -89,6 +89,18 @@ handle_signal (int signum)
> + }
> + /* Symbol names are not available for static functions, so we do not
> + check do_test. */
> ++
> ++ /* Check that backtrace does not return more than what fits in the array
> ++ (bug 25423). */
> ++ for (int j = 0; j < NUM_FUNCTIONS; j++)
> ++ {
> ++ n = backtrace (addresses, j);
> ++ if (n > j)
> ++ {
> ++ FAIL ();
> ++ return;
> ++ }
> ++ }
> + }
> +
> + NO_INLINE int
> +diff --git a/sysdeps/powerpc/powerpc32/backtrace.c b/sysdeps/powerpc/powerpc32/backtrace.c
> +index 7c2d4726f8..d1456c8ae4 100644
> +--- a/sysdeps/powerpc/powerpc32/backtrace.c
> ++++ b/sysdeps/powerpc/powerpc32/backtrace.c
> +@@ -114,6 +114,8 @@ __backtrace (void **array, int size)
> + }
> + if (gregset)
> + {
> ++ if (count + 1 == size)
> ++ break;
> + array[++count] = (void*)((*gregset)[PT_NIP]);
> + current = (void*)((*gregset)[PT_R1]);
> + }
> +diff --git a/sysdeps/powerpc/powerpc64/backtrace.c b/sysdeps/powerpc/powerpc64/backtrace.c
> +index 65c260ab76..8a53a1088f 100644
> +--- a/sysdeps/powerpc/powerpc64/backtrace.c
> ++++ b/sysdeps/powerpc/powerpc64/backtrace.c
> +@@ -87,6 +87,8 @@ __backtrace (void **array, int size)
> + if (is_sigtramp_address (current->return_address))
> + {
> + struct signal_frame_64 *sigframe = (struct signal_frame_64*) current;
> ++ if (count + 1 == size)
> ++ break;
> + array[++count] = (void*) sigframe->uc.uc_mcontext.gp_regs[PT_NIP];
> + current = (void*) sigframe->uc.uc_mcontext.gp_regs[PT_R1];
> + }
> +--
> +2.23.0
> +
> diff --git a/meta/recipes-core/glibc/glibc_2.30.bb b/meta/recipes-core/glibc/glibc_2.30.bb
> index c9e44a396d..84a6538ea1 100644
> --- a/meta/recipes-core/glibc/glibc_2.30.bb
> +++ b/meta/recipes-core/glibc/glibc_2.30.bb
> @@ -43,6 +43,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
> file://0028-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch \
> file://CVE-2019-19126.patch \
> file://CVE-2020-10029.patch \
> + file://CVE-2020-1751.patch \
> "
> S = "${WORKDIR}/git"
> B = "${WORKDIR}/build-${TARGET_SYS}"
>
>
>
>
>
[-- Attachment #2: Type: text/html, Size: 5473 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-21 4:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-20 9:58 [ZEUS][OE-core][PATCH] glibc: CVE-2020-1751 Zhixiong Chi
2020-04-21 2:31 ` akuster
2020-04-21 4:21 ` Khem Raj
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox