Re: [OE-core] [hardknott][PATCH] binutils: Fix CVE-2021-3530
Hi Anuj, Thanks for checking the patch and providing your comments. >> This needs a CVE tag, your Signed-off-by and Upstream-Status. Done. >> Also, it looks like this will break MinGW builds and would also need: Added. Will check for the CVE tags and other indentations properly. Please find the modified patch posted at following link:- https://lists.openembedded.org/g/openembedded-core/message/157582 Thanks, Pgowda -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#157583): https://lists.openembedded.org/g/openembedded-core/message/157583 Mute This Topic: https://lists.openembedded.org/mt/86624481/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [hardknott][PATCH] binutils: Fix CVE-2021-3530
On Wed, 2021-10-27 at 03:47 -0700, Pgowda wrote:
> Backport from binutils-2_37
>
> Signed-off-by: Pgowda
> ---
> .../binutils/binutils-2.36.inc | 1 +
> .../binutils/0017-CVE-2021-3530.patch | 97 +++
> 2 files changed, 98 insertions(+)
> create mode 100644 meta/recipes-devtools/binutils/binutils/0017-CVE-
> 2021-3530.patch
>
> diff --git a/meta/recipes-devtools/binutils/binutils-2.36.inc
> b/meta/recipes-devtools/binutils/binutils-2.36.inc
> index 9d770db5a8..981692e457 100644
> --- a/meta/recipes-devtools/binutils/binutils-2.36.inc
> +++ b/meta/recipes-devtools/binutils/binutils-2.36.inc
> @@ -44,5 +44,6 @@ SRC_URI = "\
> file://0001-CVE-2021-20197.patch \
> file://0002-CVE-2021-20197.patch \
> file://0003-CVE-2021-20197.patch \
> + file://0017-CVE-2021-3530.patch \
> "
> S = "${WORKDIR}/git"
> diff --git a/meta/recipes-devtools/binutils/binutils/0017-CVE-2021-
> 3530.patch b/meta/recipes-devtools/binutils/binutils/0017-CVE-2021-
> 3530.patch
> new file mode 100644
> index 00..f1934aa600
> --- /dev/null
> +++ b/meta/recipes-devtools/binutils/binutils/0017-CVE-2021-3530.patch
> @@ -0,0 +1,97 @@
> +From 25162c795b1a2becf936bb3581d86a307ea491eb Mon Sep 17 00:00:00 2001
> +From: Nick Clifton
> +Date: Thu, 15 Jul 2021 16:51:56 +0100
> +Subject: [PATCH] Fix a stack exhaustion problem in the Rust demangling
> code in
> + the libiberty library.
> +
> + PR 99935
> + * rust-demangle.c: Add recursion limit.
This needs a CVE tag, your Signed-off-by and Upstream-Status. Please
see:
https://wiki.yoctoproject.org/wiki/Security#Patch_name_convention_and_commit_message
Also, it looks like this will break MinGW builds and would also need:
https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=999566402e3
Please check.
Thanks,
Anuj
> +---
> + libiberty/ChangeLog | 5 +
> + libiberty/rust-demangle.c | 31 +--
> + 2 files changed, 30 insertions(+), 6 deletions(-)
> +
> +diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
> +index bc1b35b97c4..8e39fd28eba 100644
> +--- a/libiberty/ChangeLog
> b/libiberty/ChangeLog
> +@@ -1,3 +1,8 @@
> ++2021-07-15 Nick Clifton
> ++
> ++ PR 99935
> ++ * rust-demangle.c: Add recursion limit.
> ++
> + 2021-01-04 Martin Liska
> +
> + * strverscmp.c: Convert to utf8 from iso8859.
> +diff --git a/libiberty/rust-demangle.c b/libiberty/rust-demangle.c
> +index 449941b56dc..df09b7b8fdd 100644
> +--- a/libiberty/rust-demangle.c
> b/libiberty/rust-demangle.c
> +@@ -74,6 +74,12 @@ struct rust_demangler
> + /* Rust mangling version, with legacy mangling being -1. */
> + int version;
> +
> ++ /* Recursion depth. */
> ++ uint recursion;
> ++ /* Maximum number of times demangle_path may be called
> recursively. */
> ++#define RUST_MAX_RECURSION_COUNT 1024
> ++#define RUST_NO_RECURSION_LIMIT ((uint) -1)
> ++
> + uint64_t bound_lifetime_depth;
> + };
> +
> +@@ -671,6 +677,15 @@ demangle_path (struct rust_demangler *rd
> + if (rdm->errored)
> + return;
> +
> ++ if (rdm->recursion != RUST_NO_RECURSION_LIMIT)
> ++ {
> ++ ++ rdm->recursion;
> ++ if (rdm->recursion > RUST_MAX_RECURSION_COUNT)
> ++ /* FIXME: There ought to be a way to report
> ++ that the recursion limit has been reached. */
> ++ goto fail_return;
> ++ }
> ++
> + switch (tag = next (rdm))
> + {
> + case 'C':
> +@@ -688,10 +703,7 @@ demangle_path (struct rust_demangler *rd
> + case 'N':
> + ns = next (rdm);
> + if (!ISLOWER (ns) && !ISUPPER (ns))
> +- {
> +- rdm->errored = 1;
> +- return;
> +- }
> ++ goto fail_return;
> +
> + demangle_path (rdm, in_value);
> +
> +@@ -776,9 +788,15 @@ demangle_path (struct rust_demangler *rd
> + }
> + break;
> + default:
> +- rdm->errored = 1;
> +- return;
> ++ goto fail_return;
> + }
> ++ goto pass_return;
> ++
> ++ fail_return:
> ++ rdm->errored = 1;
> ++ pass_return:
> ++ if (rdm->recursion != RUST_NO_RECURSION_LIMIT)
> ++ -- rdm->recursion;
> + }
> +
> + static void
> +@@ -1317,6 +1335,7 @@ rust_demangle_callback (const char *mang
> + rdm.skipping_printing = 0;
> + rdm.verbose = (options & DMGL_VERBOSE) != 0;
> + rdm.version = 0;
> ++ rdm.recursion = (options & DMGL_NO_RECURSE_LIMIT) ?
> RUST_NO_RECURSION_LIMIT : 0;
> + rdm.bound_lifetime_depth = 0;
> +
> + /* Rust symbols always start with _R (v0) or _ZN (legacy). */
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#157515):
https://lists.openembedded.org/g/openembedded-core/message/157515
Mute This Topic: https://lists.openembedded.org/mt/86624481/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [hardknott][PATCH] binutils: Fix CVE-2021-3530
Backport from binutils-2_37
Signed-off-by: Pgowda
---
.../binutils/binutils-2.36.inc| 1 +
.../binutils/0017-CVE-2021-3530.patch | 97 +++
2 files changed, 98 insertions(+)
create mode 100644
meta/recipes-devtools/binutils/binutils/0017-CVE-2021-3530.patch
diff --git a/meta/recipes-devtools/binutils/binutils-2.36.inc
b/meta/recipes-devtools/binutils/binutils-2.36.inc
index 9d770db5a8..981692e457 100644
--- a/meta/recipes-devtools/binutils/binutils-2.36.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.36.inc
@@ -44,5 +44,6 @@ SRC_URI = "\
file://0001-CVE-2021-20197.patch \
file://0002-CVE-2021-20197.patch \
file://0003-CVE-2021-20197.patch \
+ file://0017-CVE-2021-3530.patch \
"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-devtools/binutils/binutils/0017-CVE-2021-3530.patch
b/meta/recipes-devtools/binutils/binutils/0017-CVE-2021-3530.patch
new file mode 100644
index 00..f1934aa600
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0017-CVE-2021-3530.patch
@@ -0,0 +1,97 @@
+From 25162c795b1a2becf936bb3581d86a307ea491eb Mon Sep 17 00:00:00 2001
+From: Nick Clifton
+Date: Thu, 15 Jul 2021 16:51:56 +0100
+Subject: [PATCH] Fix a stack exhaustion problem in the Rust demangling code in
+ the libiberty library.
+
+ PR 99935
+ * rust-demangle.c: Add recursion limit.
+---
+ libiberty/ChangeLog | 5 +
+ libiberty/rust-demangle.c | 31 +--
+ 2 files changed, 30 insertions(+), 6 deletions(-)
+
+diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
+index bc1b35b97c4..8e39fd28eba 100644
+--- a/libiberty/ChangeLog
b/libiberty/ChangeLog
+@@ -1,3 +1,8 @@
++2021-07-15 Nick Clifton
++
++ PR 99935
++ * rust-demangle.c: Add recursion limit.
++
+ 2021-01-04 Martin Liska
+
+ * strverscmp.c: Convert to utf8 from iso8859.
+diff --git a/libiberty/rust-demangle.c b/libiberty/rust-demangle.c
+index 449941b56dc..df09b7b8fdd 100644
+--- a/libiberty/rust-demangle.c
b/libiberty/rust-demangle.c
+@@ -74,6 +74,12 @@ struct rust_demangler
+ /* Rust mangling version, with legacy mangling being -1. */
+ int version;
+
++ /* Recursion depth. */
++ uint recursion;
++ /* Maximum number of times demangle_path may be called recursively. */
++#define RUST_MAX_RECURSION_COUNT 1024
++#define RUST_NO_RECURSION_LIMIT ((uint) -1)
++
+ uint64_t bound_lifetime_depth;
+ };
+
+@@ -671,6 +677,15 @@ demangle_path (struct rust_demangler *rd
+ if (rdm->errored)
+ return;
+
++ if (rdm->recursion != RUST_NO_RECURSION_LIMIT)
++{
++ ++ rdm->recursion;
++ if (rdm->recursion > RUST_MAX_RECURSION_COUNT)
++ /* FIXME: There ought to be a way to report
++ that the recursion limit has been reached. */
++ goto fail_return;
++}
++
+ switch (tag = next (rdm))
+ {
+ case 'C':
+@@ -688,10 +703,7 @@ demangle_path (struct rust_demangler *rd
+ case 'N':
+ ns = next (rdm);
+ if (!ISLOWER (ns) && !ISUPPER (ns))
+-{
+- rdm->errored = 1;
+- return;
+-}
++ goto fail_return;
+
+ demangle_path (rdm, in_value);
+
+@@ -776,9 +788,15 @@ demangle_path (struct rust_demangler *rd
+ }
+ break;
+ default:
+- rdm->errored = 1;
+- return;
++ goto fail_return;
+ }
++ goto pass_return;
++
++ fail_return:
++ rdm->errored = 1;
++ pass_return:
++ if (rdm->recursion != RUST_NO_RECURSION_LIMIT)
++-- rdm->recursion;
+ }
+
+ static void
+@@ -1317,6 +1335,7 @@ rust_demangle_callback (const char *mang
+ rdm.skipping_printing = 0;
+ rdm.verbose = (options & DMGL_VERBOSE) != 0;
+ rdm.version = 0;
++ rdm.recursion = (options & DMGL_NO_RECURSE_LIMIT) ? RUST_NO_RECURSION_LIMIT
: 0;
+ rdm.bound_lifetime_depth = 0;
+
+ /* Rust symbols always start with _R (v0) or _ZN (legacy). */
--
2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#157510):
https://lists.openembedded.org/g/openembedded-core/message/157510
Mute This Topic: https://lists.openembedded.org/mt/86624481/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
