Skip to contentSkip to conversation

binutils: Fix CVE-2021-3530

PATCH Superseded Pgowda 2 participants 3 messages Oct 27, 2021 – Oct 28, 2021

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Pgowda

author
#0 lore raw

PATCH 1/1 binutils: Fix CVE-2021-3530

Backport from binutils-2_37

---
 .../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
meta/recipes-devtools/binutils/binutils-2.36.inc +1 -0
index 9d770db5a8..981692e457 100644
@@ -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"
meta/recipes-devtools/binutils/binutils/0017-CVE-2021-3530.patch new file +97 -0

97 lines not on this page · raw message

Signature · 1 line
2.31.1
#1 lore raw
Quoted 34 lines · Pgowda

Backport from binutils-2_37

---
 .../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

meta/recipes-devtools/binutils/binutils-2.36.inc +1 -0
index 9d770db5a8..981692e457 100644
@@ -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"

(quoted diff) +0 -0

3530.patch b/meta/recipes-devtools/binutils/binutils/0017-CVE-2021- 3530.patch
new file mode 100644
index 0000000000..f1934aa600

meta/recipes-devtools/binutils/binutils/0017-CVE-2021-3530.patch new file +4 -0
@@ -0,0 +1,97 @@
+From 25162c795b1a2becf936bb3581d86a307ea491eb Mon Sep 17 00:00:00 2001
+From: Nick Clifton <[email protected]>
+Date: Thu, 15 Jul 2021 16:51:56 +0100
+Subject: [PATCH] Fix a stack exhaustion problem in the Rust demangling
Quoted 5 lines

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

Quoted 91 lines
+---
+ libiberty/ChangeLog       |  5 +++++
+ libiberty/rust-demangle.c | 31 +++++++++++++++++++++++++------

+ 2 files changed, 30 insertions(+), 6 deletions(-)

meta/recipes-devtools/binutils/binutils/0017-CVE-2021-3530.patch new file +25 -0
+
+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  <[email protected]>
++
++      PR 99935
++      * rust-demangle.c: Add recursion limit.
++
+ 2021-01-04  Martin Liska  <[email protected]>
+ 
+       * 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). */

author
#2 lore raw

Hi Anuj,

Thanks for checking the patch and providing your comments.

Quoted 1 line
Quoted 1 line

This needs a CVE tag, your Signed-off-by and Upstream-Status.

Done.

Quoted 1 line
Quoted 1 line

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