glibc: Fix CVE-2021-33574
PATCH 1/1 glibc: Fix CVE-2021-33574
Source: https://sourceware.org/git/glibc.git
Tracking -- https://sourceware.org/bugzilla/show_bug.cgi?id=27896
Backported upstream commit 42d359350510506b87101cf77202fefcbfc790cb to glibc-2.33 source with dependent commit id 217b6dc298156bdb0d6aea9ea93e7e394a5ff091.
Upstream-Status: Backport [https://sourceware.org/git/?p=glibc.git;a=commit;h=42d359350510506b87101cf77202fefcbfc790cb]
--- .../glibc/glibc/CVE-2021-33574.patch | 61 +++++++++++++++++++ meta/recipes-core/glibc/glibc_2.33.bb | 1 + 2 files changed, 62 insertions(+) create mode 100644 meta/recipes-core/glibc/glibc/CVE-2021-33574.patch
meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +61 -0
@@ -0,0 +1,61 @@ +From 42d359350510506b87101cf77202fefcbfc790cb Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <[email protected]> +Date: Thu, 27 May 2021 12:49:47 +0200 +Subject: [PATCH] Use __pthread_attr_copy in mq_notify (bug 27896) + +Make a deep copy of the pthread attribute object to remove a potential +use-after-free issue. + +Upstream-Status: Backport [https://sourceware.org/git/?p=glibc.git;a=commit;h=42d359350510506b87101cf77202fefcbfc790cb] +CVE: CVE-2021-33574 +Signed-off-by: Vinay Kumar <[email protected]> +--- +diff --git a/sysdeps/unix/sysv/linux/mq_notify.c b/sysdeps/unix/sysv/linux/mq_notify.c +index cc575a0cdd8..6f46d29d1dc 100644 +--- a/sysdeps/unix/sysv/linux/mq_notify.c ++++ b/sysdeps/unix/sysv/linux/mq_notify.c +@@ -133,8 +133,11 @@ helper_thread (void *arg) + (void) __pthread_barrier_wait (¬ify_barrier); + } + else if (data.raw[NOTIFY_COOKIE_LEN - 1] == NOTIFY_REMOVED) +- /* The only state we keep is the copy of the thread attributes. */ +- free (data.attr); ++ { ++ /* The only state we keep is the copy of the thread attributes. */ ++ pthread_attr_destroy (data.attr); ++ free (data.attr); ++ } + } + return NULL; + } +@@ -255,8 +258,14 @@ mq_notify (mqd_t mqdes, const struct sigevent *notification) + if (data.attr == NULL) + return -1; + +- memcpy (data.attr, notification->sigev_notify_attributes, +- sizeof (pthread_attr_t)); ++ int ret = __pthread_attr_copy (data.attr, ++ notification->sigev_notify_attributes); ++ if (ret != 0) ++ { ++ free (data.attr); ++ __set_errno (ret); ++ return -1; ++ } + } + + /* Construct the new request. */ +@@ -269,8 +278,11 @@ mq_notify (mqd_t mqdes, const struct sigevent *notification) + int retval = INLINE_SYSCALL (mq_notify, 2, mqdes, &se); + + /* If it failed, free the allocated memory. */ +- if (__glibc_unlikely (retval != 0)) +- free (data.attr); ++ if (retval != 0 && data.attr != NULL) ++ { ++ pthread_attr_destroy (data.attr); ++ free (data.attr); ++ } + + return retval; + }
meta/recipes-core/glibc/glibc_2.33.bb +1 -0
@@ -57,6 +57,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ file://0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch \ file://0030-powerpc-Do-not-ask-compiler-for-finding-arch.patch \ file://mte-backports.patch \ + file://CVE-2021-33574.patch \ " S = "${WORKDIR}/git" B = "${WORKDIR}/build-${TARGET_SYS}"
Signature · 1 line
2.31.1
Quoted 10 lines · Vinay Kumar
Source: https://sourceware.org/git/glibc.git
Tracking -- https://sourceware.org/bugzilla/show_bug.cgi?id=27896Backported upstream commit
42d359350510506b87101cf77202fefcbfc790cbto glibc-2.33 source with dependent commit id217b6dc298156bdb0d6aea9ea93e7e394a5ff091.Upstream-Status: Backport
[https://sourceware.org/git/?p=glibc.git;a=commit;h=42d359350510506b87101cf77202fefcbfc790cb
]
It looks like you'd need to backport this one too:
https://sourceware.org/git/?p=glibc.git;a=commit;h=217b6dc298156bdb0d6aea9ea93e7e394a5ff091
?
Thanks,
Anuj
Quoted 100 lines
Signed-off-by Vinay Kumar <[email protected]>---
.../glibc/glibc/CVE-2021-33574.patch | 61 +++++++++++++++++++ meta/recipes-core/glibc/glibc_2.33.bb | 1 +2 files changed, 62 insertions(+)create mode 100644
meta/recipes-core/glibc/glibc/CVE-2021-33574.patchmeta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +9
-0@@ -0,0 +1,61 @@ +From 42d359350510506b87101cf77202fefcbfc790cb Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <[email protected]> +Date: Thu, 27 May 2021 12:49:47 +0200 +Subject: [PATCH] Use __pthread_attr_copy in mq_notify (bug 27896) + +Make a deep copy of the pthread attribute object to remove a potential +use-after-free issue. + +Upstream-Status: Backport[https://sourceware.org/git/?p=glibc.git;a=commit;h=42d359350510506b87101cf77202fefcbfc790cb
]meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +4
-0+CVE: CVE-2021-33574 +Signed-off-by: Vinay Kumar <[email protected]> +--- +diff --git a/sysdeps/unix/sysv/linux/mq_notify.c
b/sysdeps/unix/sysv/linux/mq_notify.c
+indexcc575a0cdd8..6f46d29d1dc100644
+---a/sysdeps/unix/sysv/linux/mq_notify.c
++++b/sysdeps/unix/sysv/linux/mq_notify.c
+@@ -133,8 +133,11 @@helper_thread(void *arg)
+ (void)__pthread_barrier_wait(¬ify_barrier); + }
+ else if (data.raw[NOTIFY_COOKIE_LEN - 1] ==NOTIFY_REMOVED) +- /* The only state we keep is the copy of the thread attributes. */
+- free (data.attr);
++ {
++ /* The only state we keep is the copy of the thread attributes. */
++pthread_attr_destroy(data.attr);
++ free (data.attr);
++ }
+ }
+ return NULL;
+ }
+@@ -255,8 +258,14 @@mq_notify(mqd_tmqdes, const struct sigevent *notification)
+ if (data.attr == NULL)
+ return -1;
++- memcpy (data.attr, notification->sigev_notify_attributes, +- sizeof (pthread_attr_t));++ int ret =
__pthread_attr_copy(data.attr, ++ notification-Quoted 1 line
sigev_notify_attributes);++ if (ret != 0)
++ {
++ free (data.attr);
++__set_errno(ret);
++ return -1;
++ }
+ }
+
+ /* Construct the new request. */
+@@ -269,8 +278,11 @@mq_notify(mqd_tmqdes, const struct sigevent *notification)
+ int retval =INLINE_SYSCALL(mq_notify, 2, mqdes, &se); +
+ /* If it failed, free the allocated memory. */+- if (__glibc_unlikely (retval != 0)) +- free (data.attr);++ if (retval != 0 && data.attr != NULL)
++ {
++pthread_attr_destroy(data.attr);
++ free (data.attr);
++ }
+
+ return retval;
+ }meta/recipes- renamed from meta/recipes-core/glibc/glibc_2.33.bb +0
-0core/glibc/glibc_2.33.bb
index925efe8cc6..e9f01a14c5100644meta/recipes-core/glibc/glibc_2.33.bb +0
-0@@ -57,6 +57,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \file://0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch \
file://0030-powerpc-Do-not-ask-compiler-for-finding-arch.patch \
file://mte-backports.patch \
+ file://CVE-2021-33574.patch \
"
S = "${WORKDIR}/git"
B = "${WORKDIR}/build-${TARGET_SYS}"
Hi Anuj,
The patch is conjugate of both commits.
https://sourceware.org/git/?p=glibc.git;a=commit;h=42d359350510506b87101cf77202fefcbfc790cb
https://sourceware.org/git/?p=glibc.git;a=commit;h=217b6dc298156bdb0d6aea9ea93e7e394a5ff091
Also, the patch is committed to master branch
http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=55681d09d7f519a1c7f17d17b18ec59bccdc91ca
Due you want me to resubmit for "hardknott" branch by splitting in to 2 patches ?
Regards,
Vinay
Quoted 124 lines · Anuj
Quoted 10 lines · Vinay Kumar
Source: https://sourceware.org/git/glibc.git
Tracking -- https://sourceware.org/bugzilla/show_bug.cgi?id=27896Backported upstream commit
42d359350510506b87101cf77202fefcbfc790cbto glibc-2.33 source with dependent commit id217b6dc298156bdb0d6aea9ea93e7e394a5ff091.Upstream-Status: Backport
[https://sourceware.org/git/?p=glibc.git;a=commit;h=42d359350510506b87101cf77202fefcbfc790cb
]It looks like you'd need to backport this one too:
https://sourceware.org/git/?p=glibc.git;a=commit;h=217b6dc298156bdb0d6aea9ea93e7e394a5ff091
?
Thanks,
Anuj
Quoted 100 lines
Signed-off-by Vinay Kumar <[email protected]>--- .../glibc/glibc/CVE-2021-33574.patch | 61 +++++++++++++++++++ meta/recipes-core/glibc/glibc_2.33.bb | 1 + 2 files changed, 62 insertions(+) create mode 100644 meta/recipes-core/glibc/glibc/CVE-2021-33574.patchmeta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +9
-0@@ -0,0 +1,61 @@ +From 42d359350510506b87101cf77202fefcbfc790cb Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <[email protected]> +Date: Thu, 27 May 2021 12:49:47 +0200 +Subject: [PATCH] Use __pthread_attr_copy in mq_notify (bug 27896) + +Make a deep copy of the pthread attribute object to remove a potential +use-after-free issue. + +Upstream-Status: Backport[https://sourceware.org/git/?p=glibc.git;a=commit;h=42d359350510506b87101cf77202fefcbfc790cb
]meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +4
-0+CVE: CVE-2021-33574 +Signed-off-by: Vinay Kumar <[email protected]> +--- +diff --git a/sysdeps/unix/sysv/linux/mq_notify.c
b/sysdeps/unix/sysv/linux/mq_notify.cmeta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +8
-0+index cc575a0cdd8..6f46d29d1dc 100644 +--- a/sysdeps/unix/sysv/linux/mq_notify.c ++++ b/sysdeps/unix/sysv/linux/mq_notify.c +@@ -133,8 +133,11 @@ helper_thread (void *arg) + (void) __pthread_barrier_wait (¬ify_barrier); + } + else if (data.raw[NOTIFY_COOKIE_LEN - 1] == NOTIFY_REMOVED) +- /* The only state we keep is the copy of the threadattributes. */
+- free (data.attr); ++ { ++ /* The only state we keep is the copy of the thread attributes. */ ++ pthread_attr_destroy (data.attr); ++ free (data.attr); ++ }meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +4
-0+ } + return NULL; + } +@@ -255,8 +258,14 @@ mq_notify (mqd_t mqdes, const struct sigevent*notification)
meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +7
-0+ if (data.attr == NULL) + return -1; + +- memcpy (data.attr, notification->sigev_notify_attributes, +- sizeof (pthread_attr_t)); ++ int ret = __pthread_attr_copy (data.attr, ++ notification-Quoted 1 line
sigev_notify_attributes);++ if (ret != 0)
++ {++ free (data.attr); ++ __set_errno (ret); ++ return -1;++ }
meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +4
-0+ } + + /* Construct the new request. */ +@@ -269,8 +278,11 @@ mq_notify (mqd_t mqdes, const struct sigevent*notification)
meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +13
-0+ int retval = INLINE_SYSCALL (mq_notify, 2, mqdes, &se); + + /* If it failed, free the allocated memory. */ +- if (__glibc_unlikely (retval != 0)) +- free (data.attr); ++ if (retval != 0 && data.attr != NULL) ++ { ++ pthread_attr_destroy (data.attr); ++ free (data.attr); ++ } + + return retval; + }meta/recipes- renamed from meta/recipes-core/glibc/glibc_2.33.bb +0
-0core/glibc/glibc_2.33.bb
index925efe8cc6..e9f01a14c5100644meta/recipes-core/glibc/glibc_2.33.bb +1
-0@@ -57,6 +57,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ file://0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch \ file://0030-powerpc-Do-not-ask-compiler-for-finding-arch.patch \ file://mte-backports.patch \ + file://CVE-2021-33574.patch \"S = "${WORKDIR}/git"
B = "${WORKDIR}/build-${TARGET_SYS}"
Quoted 7 lines · Vinay Kumar
Hi Anuj,
The patch is conjugate of both commits.
https://sourceware.org/git/?p=glibc.git;a=commit;h=42d359350510506b87101cf77202fefcbfc790cb
https://sourceware.org/git/?p=glibc.git;a=commit;h=217b6dc298156bdb0d6aea9ea93e7e394a5ff091
Quoted 5 lines
Also, the patch is committed to master branch
http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=55681d09d7f519a1c7f17d17b18ec59bccdc91caDue you want me to resubmit for "hardknott" branch by splitting in to 2 patches ?
It seems wrong to me because the patch header/description is not correct here. It's no longer a backport of just 42d359350510506b87101cf77202fefcbfc790cb.
I also just noticed that there's already a fix for this CVE in my branch. So I think I will take that:
Thanks,
Anuj
Quoted 138 lines
Regards,
VinayQuoted 132 lines · Anuj
Quoted 8 lines · Vinay Kumar
Source: https://sourceware.org/git/glibc.git
Tracking -- https://sourceware.org/bugzilla/show_bug.cgi?id=27896Backported upstream commit
42d359350510506b87101cf77202fefcbfc790cbto
glibc-2.33 source with dependent commit id217b6dc298156bdb0d6aea9ea93e7e394a5ff091.Quoted 4 lines
Upstream-Status: Backport
[
https://sourceware.org/git/?p=glibc.git;a=commit;h=42d359350510506b87101cf77202fefcbfc790cb
]It looks like you'd need to backport this one too:
https://sourceware.org/git/?p=glibc.git;a=commit;h=217b6dc298156bdb0d6aea9ea93e7e394a5ff091
?
Thanks,
Anuj
Quoted 106 lines
Signed-off-by Vinay Kumar <[email protected]>---
.../glibc/glibc/CVE-2021-33574.patch | 61
+++++++++++++++++++
meta/recipes-core/glibc/glibc_2.33.bb | 1 +2 files changed, 62 insertions(+)create mode 100644 meta/recipes-core/glibc/glibc/CVE-2021- 33574.patch
meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +1
-0@@ -0,0 +1,61 @@ +From 42d359350510506b87101cf77202fefcbfc790cb Mon Sep 17 00:00:002001
meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +5
-0+From: Andreas Schwab <[email protected]> +Date: Thu, 27 May 2021 12:49:47 +0200 +Subject: [PATCH] Use __pthread_attr_copy in mq_notify (bug 27896) + +Make a deep copy of the pthread attribute object to remove apotential
meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +3
-0+use-after-free issue. + +Upstream-Status: Backport[
https://sourceware.org/git/?p=glibc.git;a=commit;h=42d359350510506b87101cf77202fefcbfc790cb
]meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +4
-0+CVE: CVE-2021-33574 +Signed-off-by: Vinay Kumar <[email protected]> +--- +diff --git a/sysdeps/unix/sysv/linux/mq_notify.c
b/sysdeps/unix/sysv/linux/mq_notify.c
+indexcc575a0cdd8..6f46d29d1dc100644
+---a/sysdeps/unix/sysv/linux/mq_notify.c
++++b/sysdeps/unix/sysv/linux/mq_notify.c
+@@ -133,8 +133,11 @@helper_thread(void *arg)
+ (void)__pthread_barrier_wait(¬ify_barrier); + }
+ else if (data.raw[NOTIFY_COOKIE_LEN - 1] ==NOTIFY_REMOVED) +- /* The only state we keep is the copy of the thread attributes. */
+- free (data.attr);
++ {
++ /* The only state we keep is the copy of the thread attributes. */
++pthread_attr_destroy(data.attr);
++ free (data.attr);
++ }
+ }
+ return NULL;
+ }
+@@ -255,8 +258,14 @@mq_notify(mqd_tmqdes, const struct sigevent *notification)
+ if (data.attr == NULL)
+ return -1;
++- memcpy (data.attr, notification->sigev_notify_attributes, +- sizeof (pthread_attr_t));++ int ret =
__pthread_attr_copy(data.attr, ++ notification-Quoted 1 line
sigev_notify_attributes);++ if (ret != 0)
++ {
++ free (data.attr);
++__set_errno(ret);
++ return -1;
++ }
+ }
+
+ /* Construct the new request. */
+@@ -269,8 +278,11 @@mq_notify(mqd_tmqdes, const struct sigevent *notification)
+ int retval =INLINE_SYSCALL(mq_notify, 2, mqdes, &se);meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +12
-0+ + /* If it failed, free the allocated memory. */ +- if (__glibc_unlikely (retval != 0)) +- free (data.attr); ++ if (retval != 0 && data.attr != NULL) ++ { ++ pthread_attr_destroy (data.attr); ++ free (data.attr); ++ } + + return retval; + }meta/recipes- renamed from meta/recipes-core/glibc/glibc_2.33.bb +0
-0core/glibc/glibc_2.33.bb
index925efe8cc6..e9f01a14c5100644meta/recipes-core/glibc/glibc_2.33.bb +0
-0@@ -57,6 +57,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \file://0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch \
file://0030-powerpc-Do-not-ask-compiler-for-finding-arch.patch \
file://mte-backports.patch \
+ file://CVE-2021-33574.patch \
"
S = "${WORKDIR}/git"
B = "${WORKDIR}/build-${TARGET_SYS}"
Hi Anuj,
Quoted 3 lines
Quoted 3 lines
It seems wrong to me because the patch header/description is not correct here. It's no longer a backport of just
42d359350510506b87101cf77202fefcbfc790cb.
Yes, I merged 2 commits first (42d359350510506b87101cf77202fefcbfc790cb and 217b6dc298156bdb0d6aea9ea93e7e394a5ff091)
and then backported as a single patch, and I used only the patch header of 42d359350510506b87101cf77202fefcbfc790cb.
Quoted 2 lines
Quoted 2 lines
I also just noticed that there's already a fix for this CVE in my branch. So I think I will take that:
Ok, thanks. Will go with this once it gets merged to the "hardknott" branch.
Regards,
Vinay
Quoted 167 lines · Anuj
Quoted 5 lines · Vinay Kumar
Hi Anuj,
The patch is conjugate of both commits.
https://sourceware.org/git/?p=glibc.git;a=commit;h=42d359350510506b87101cf77202fefcbfc790cbQuoted 7 lines
https://sourceware.org/git/?p=glibc.git;a=commit;h=217b6dc298156bdb0d6aea9ea93e7e394a5ff091
Also, the patch is committed to master branch
http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=55681d09d7f519a1c7f17d17b18ec59bccdc91caDue you want me to resubmit for "hardknott" branch by splitting in to 2 patches ?
It seems wrong to me because the patch header/description is not correct here. It's no longer a backport of just
42d359350510506b87101cf77202fefcbfc790cb.I also just noticed that there's already a fix for this CVE in my branch. So I think I will take that:
Thanks,
Anuj
Quoted 138 lines
Regards,
VinayQuoted 132 lines · Anuj
Quoted 8 lines · Vinay Kumar
Source: https://sourceware.org/git/glibc.git
Tracking -- https://sourceware.org/bugzilla/show_bug.cgi?id=27896Backported upstream commit
42d359350510506b87101cf77202fefcbfc790cbto
glibc-2.33 source with dependent commit id217b6dc298156bdb0d6aea9ea93e7e394a5ff091.Quoted 4 lines
Upstream-Status: Backport
[
https://sourceware.org/git/?p=glibc.git;a=commit;h=42d359350510506b87101cf77202fefcbfc790cb
]It looks like you'd need to backport this one too:
https://sourceware.org/git/?p=glibc.git;a=commit;h=217b6dc298156bdb0d6aea9ea93e7e394a5ff091
?
Thanks,
Anuj
Quoted 106 lines
Signed-off-by Vinay Kumar <[email protected]>--- .../glibc/glibc/CVE-2021-33574.patch | 61 +++++++++++++++++++ meta/recipes-core/glibc/glibc_2.33.bb | 1 + 2 files changed, 62 insertions(+) create mode 100644 meta/recipes-core/glibc/glibc/CVE-2021-33574.patch
meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +1
-0@@ -0,0 +1,61 @@ +From 42d359350510506b87101cf77202fefcbfc790cb Mon Sep 17 00:00:002001
meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +5
-0+From: Andreas Schwab <[email protected]> +Date: Thu, 27 May 2021 12:49:47 +0200 +Subject: [PATCH] Use __pthread_attr_copy in mq_notify (bug 27896) + +Make a deep copy of the pthread attribute object to remove apotential
meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +3
-0+use-after-free issue. + +Upstream-Status: Backport[
https://sourceware.org/git/?p=glibc.git;a=commit;h=42d359350510506b87101cf77202fefcbfc790cb
]meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +4
-0+CVE: CVE-2021-33574 +Signed-off-by: Vinay Kumar <[email protected]> +--- +diff --git a/sysdeps/unix/sysv/linux/mq_notify.c
b/sysdeps/unix/sysv/linux/mq_notify.cmeta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +8
-0+index cc575a0cdd8..6f46d29d1dc 100644 +--- a/sysdeps/unix/sysv/linux/mq_notify.c ++++ b/sysdeps/unix/sysv/linux/mq_notify.c +@@ -133,8 +133,11 @@ helper_thread (void *arg) + (void) __pthread_barrier_wait (¬ify_barrier); + } + else if (data.raw[NOTIFY_COOKIE_LEN - 1] == NOTIFY_REMOVED) +- /* The only state we keep is the copy of the threadattributes. */
+- free (data.attr); ++ { ++ /* The only state we keep is the copy of the thread attributes. */ ++ pthread_attr_destroy (data.attr); ++ free (data.attr); ++ }meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +4
-0+ } + return NULL; + } +@@ -255,8 +258,14 @@ mq_notify (mqd_t mqdes, const struct sigevent*notification)
meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +7
-0+ if (data.attr == NULL) + return -1; + +- memcpy (data.attr, notification->sigev_notify_attributes, +- sizeof (pthread_attr_t)); ++ int ret = __pthread_attr_copy (data.attr, ++ notification-Quoted 1 line
sigev_notify_attributes);++ if (ret != 0)
++ {++ free (data.attr); ++ __set_errno (ret); ++ return -1;++ }
meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +4
-0+ } + + /* Construct the new request. */ +@@ -269,8 +278,11 @@ mq_notify (mqd_t mqdes, const struct sigevent*notification)
meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +13
-0+ int retval = INLINE_SYSCALL (mq_notify, 2, mqdes, &se); + + /* If it failed, free the allocated memory. */ +- if (__glibc_unlikely (retval != 0)) +- free (data.attr); ++ if (retval != 0 && data.attr != NULL) ++ { ++ pthread_attr_destroy (data.attr); ++ free (data.attr); ++ } + + return retval; + }meta/recipes- renamed from meta/recipes-core/glibc/glibc_2.33.bb +0
-0core/glibc/glibc_2.33.bb
index925efe8cc6..e9f01a14c5100644meta/recipes-core/glibc/glibc_2.33.bb +0
-0@@ -57,6 +57,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \file://0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch
\file://0030-powerpc-Do-not-ask-compiler-for-finding-arch.patch \ file://mte-backports.patch \ + file://CVE-2021-33574.patch \ "S = "${WORKDIR}/git"
B = "${WORKDIR}/build-${TARGET_SYS}"
There is now an additional fix on top of this:
https://it.slashdot.org/story/21/08/16/2131221/linux-glibc-security-fix-created-a-nastier-linux-bug
https://access.redhat.com/security/cve/cve-2021-38604
//E
Den mån 2 aug. 2021 kl 06:14 skrev Vinay Kumar <[email protected]>:
Quoted 201 lines
Hi Anuj,
Quoted 3 lines
Quoted 3 lines
It seems wrong to me because the patch header/description is not correct here. It's no longer a backport of just
42d359350510506b87101cf77202fefcbfc790cb.Yes, I merged 2 commits first (
42d359350510506b87101cf77202fefcbfc790cband217b6dc298156bdb0d6aea9ea93e7e394a5ff091)
and then backported as a single patch, and I used only the patch header of42d359350510506b87101cf77202fefcbfc790cb.Quoted 2 lines
Quoted 2 lines
I also just noticed that there's already a fix for this CVE in my branch. So I think I will take that:
Ok, thanks. Will go with this once it gets merged to the "hardknott" branch.
Regards,
VinayQuoted 6 lines · Anuj
Quoted 4 lines · Vinay Kumar
Hi Anuj,
The patch is conjugate of both commits.
https://sourceware.org/git/?p=glibc.git;a=commit;h=42d359350510506b87101cf77202fefcbfc790cb
Quoted 2 lines
Quoted 2 lines
https://sourceware.org/git/?p=glibc.git;a=commit;h=217b6dc298156bdb0d6aea9ea93e7e394a5ff091
Quoted 3 lines
Quoted 3 lines
Also, the patch is committed to master branch
http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=55681d09d7f519a1c7f17d17b18ec59bccdc91ca
Quoted 4 lines
Quoted 3 lines
Due you want me to resubmit for "hardknott" branch by splitting in to 2 patches ?
Quoted 8 lines
It seems wrong to me because the patch header/description is not correct here. It's no longer a backport of just
42d359350510506b87101cf77202fefcbfc790cb.I also just noticed that there's already a fix for this CVE in my branch. So I think I will take that:
Quoted 24 lines
Thanks,
Anuj
Quoted 19 lines
Regards,
VinayQuoted 13 lines · Anuj
Quoted 11 lines · Vinay Kumar
Source: https://sourceware.org/git/glibc.git
Tracking -- https://sourceware.org/bugzilla/show_bug.cgi?id=27896Backported upstream commit
42d359350510506b87101cf77202fefcbfc790cbto
glibc-2.33 source with dependent commit id217b6dc298156bdb0d6aea9ea93e7e394a5ff091.Upstream-Status: Backport
[https://sourceware.org/git/?p=glibc.git;a=commit;h=42d359350510506b87101cf77202fefcbfc790cb
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 1 line
]
It looks like you'd need to backport this one too:
https://sourceware.org/git/?p=glibc.git;a=commit;h=217b6dc298156bdb0d6aea9ea93e7e394a5ff091
Quoted 29 lines
Quoted 29 lines
Quoted 29 lines
?
Thanks,
Anuj
Quoted 22 lines
Signed-off-by Vinay Kumar <[email protected]>--- .../glibc/glibc/CVE-2021-33574.patch | 61 +++++++++++++++++++ meta/recipes-core/glibc/glibc_2.33.bb | 1 + 2 files changed, 62 insertions(+) create mode 100644 meta/recipes-core/glibc/glibc/CVE-2021-33574.patch
meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +1
-0@@ -0,0 +1,61 @@ +From 42d359350510506b87101cf77202fefcbfc790cb Mon Sep 17 00:00:002001
meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +3
-0+From: Andreas Schwab <[email protected]> +Date: Thu, 27 May 2021 12:49:47 +0200 +Subject: [PATCH] Use __pthread_attr_copy in mq_notify (bug 27896)Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +2
-0+ +Make a deep copy of the pthread attribute object to remove apotential
meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +3
-0+use-after-free issue. + +Upstream-Status: Backport[
https://sourceware.org/git/?p=glibc.git;a=commit;h=42d359350510506b87101cf77202fefcbfc790cb
Quoted 60 lines
Quoted 60 lines
Quoted 60 lines
Quoted 60 lines
]
meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +4
-0+CVE: CVE-2021-33574 +Signed-off-by: Vinay Kumar <[email protected]> +--- +diff --git a/sysdeps/unix/sysv/linux/mq_notify.c
b/sysdeps/unix/sysv/linux/mq_notify.cmeta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +8
-0+index cc575a0cdd8..6f46d29d1dc 100644 +--- a/sysdeps/unix/sysv/linux/mq_notify.c ++++ b/sysdeps/unix/sysv/linux/mq_notify.c +@@ -133,8 +133,11 @@ helper_thread (void *arg) + (void) __pthread_barrier_wait (¬ify_barrier); + } + else if (data.raw[NOTIFY_COOKIE_LEN - 1] == NOTIFY_REMOVED) +- /* The only state we keep is the copy of the threadattributes. */
+- free (data.attr); ++ { ++ /* The only state we keep is the copy of the thread attributes. */ ++ pthread_attr_destroy (data.attr); ++ free (data.attr); ++ }meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +4
-0+ } + return NULL; + } +@@ -255,8 +258,14 @@ mq_notify (mqd_t mqdes, const struct sigevent*notification)
meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +7
-0+ if (data.attr == NULL) + return -1; + +- memcpy (data.attr, notification->sigev_notify_attributes, +- sizeof (pthread_attr_t)); ++ int ret = __pthread_attr_copy (data.attr, ++ notification-Quoted 1 line
sigev_notify_attributes);++ if (ret != 0)
++ {++ free (data.attr); ++ __set_errno (ret); ++ return -1;++ }
meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +4
-0+ } + + /* Construct the new request. */ +@@ -269,8 +278,11 @@ mq_notify (mqd_t mqdes, const struct sigevent*notification)
meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +13
-0+ int retval = INLINE_SYSCALL (mq_notify, 2, mqdes, &se); + + /* If it failed, free the allocated memory. */ +- if (__glibc_unlikely (retval != 0)) +- free (data.attr); ++ if (retval != 0 && data.attr != NULL) ++ { ++ pthread_attr_destroy (data.attr); ++ free (data.attr); ++ } + + return retval; + }meta/recipes- renamed from meta/recipes-core/glibc/glibc_2.33.bb +0
-0Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
meta/recipes-core/glibc/glibc_2.33.bb SRC_URI = · line 59
Quoted 8 lines
core/glibc/glibc_2.33.bb
index925efe8cc6..e9f01a14c5100644meta/recipes-core/glibc/glibc_2.33.bb +0
-0@@ -57,6 +57,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \file://0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch
Quoted 10 lines
Quoted 9 lines
Quoted 9 lines
Quoted 8 lines
meta/recipes-core/glibc/glibc_2.33.bb +1
-0\ file://0030-powerpc-Do-not-ask-compiler-for-finding-arch.patch \ file://mte-backports.patch \ + file://CVE-2021-33574.patch \ " S = "${WORKDIR}/git" B = "${WORKDIR}/build-${TARGET_SYS}"
Hi Ernst,
Thanks, for the update of CVE-2021-38604.
Will send a path to the hardknott branch as well as master branch.
Regards,
Vinay
Quoted 202 lines · Ernst Sjöstrand
There is now an additional fix on top of this:
https://it.slashdot.org/story/21/08/16/2131221/linux-glibc-security-fix-created-a-nastier-linux-bug
https://access.redhat.com/security/cve/cve-2021-38604
//E
Den mån 2 aug. 2021 kl 06:14 skrev Vinay Kumar <[email protected]>:
Quoted 192 lines
Hi Anuj,
Quoted 3 lines
Quoted 3 lines
It seems wrong to me because the patch header/description is not correct here. It's no longer a backport of just
42d359350510506b87101cf77202fefcbfc790cb.Yes, I merged 2 commits first (
42d359350510506b87101cf77202fefcbfc790cband217b6dc298156bdb0d6aea9ea93e7e394a5ff091)
and then backported as a single patch, and I used only the patch header of42d359350510506b87101cf77202fefcbfc790cb.Quoted 2 lines
Quoted 2 lines
I also just noticed that there's already a fix for this CVE in my branch. So I think I will take that:
Ok, thanks. Will go with this once it gets merged to the "hardknott" branch.
Regards,
VinayQuoted 167 lines · Anuj
Quoted 5 lines · Vinay Kumar
Hi Anuj,
The patch is conjugate of both commits.
https://sourceware.org/git/?p=glibc.git;a=commit;h=42d359350510506b87101cf77202fefcbfc790cbQuoted 7 lines
https://sourceware.org/git/?p=glibc.git;a=commit;h=217b6dc298156bdb0d6aea9ea93e7e394a5ff091
Also, the patch is committed to master branch
http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=55681d09d7f519a1c7f17d17b18ec59bccdc91caDue you want me to resubmit for "hardknott" branch by splitting in to 2 patches ?
It seems wrong to me because the patch header/description is not correct here. It's no longer a backport of just
42d359350510506b87101cf77202fefcbfc790cb.I also just noticed that there's already a fix for this CVE in my branch. So I think I will take that:
Thanks,
Anuj
Quoted 138 lines
Regards,
VinayQuoted 132 lines · Anuj
Quoted 8 lines · Vinay Kumar
Source: https://sourceware.org/git/glibc.git
Tracking -- https://sourceware.org/bugzilla/show_bug.cgi?id=27896Backported upstream commit
42d359350510506b87101cf77202fefcbfc790cbto
glibc-2.33 source with dependent commit id217b6dc298156bdb0d6aea9ea93e7e394a5ff091.Quoted 4 lines
Upstream-Status: Backport
[
https://sourceware.org/git/?p=glibc.git;a=commit;h=42d359350510506b87101cf77202fefcbfc790cb
]It looks like you'd need to backport this one too:
https://sourceware.org/git/?p=glibc.git;a=commit;h=217b6dc298156bdb0d6aea9ea93e7e394a5ff091
?
Thanks,
Anuj
Quoted 106 lines
Signed-off-by Vinay Kumar <[email protected]>--- .../glibc/glibc/CVE-2021-33574.patch | 61 +++++++++++++++++++ meta/recipes-core/glibc/glibc_2.33.bb | 1 + 2 files changed, 62 insertions(+) create mode 100644 meta/recipes-core/glibc/glibc/CVE-2021-33574.patch
meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +1
-0@@ -0,0 +1,61 @@ +From 42d359350510506b87101cf77202fefcbfc790cb Mon Sep 17 00:00:002001
meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +5
-0+From: Andreas Schwab <[email protected]> +Date: Thu, 27 May 2021 12:49:47 +0200 +Subject: [PATCH] Use __pthread_attr_copy in mq_notify (bug 27896) + +Make a deep copy of the pthread attribute object to remove apotential
meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +3
-0+use-after-free issue. + +Upstream-Status: Backport[
https://sourceware.org/git/?p=glibc.git;a=commit;h=42d359350510506b87101cf77202fefcbfc790cb
]meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +4
-0+CVE: CVE-2021-33574 +Signed-off-by: Vinay Kumar <[email protected]> +--- +diff --git a/sysdeps/unix/sysv/linux/mq_notify.c
b/sysdeps/unix/sysv/linux/mq_notify.cmeta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +8
-0+index cc575a0cdd8..6f46d29d1dc 100644 +--- a/sysdeps/unix/sysv/linux/mq_notify.c ++++ b/sysdeps/unix/sysv/linux/mq_notify.c +@@ -133,8 +133,11 @@ helper_thread (void *arg) + (void) __pthread_barrier_wait (¬ify_barrier); + } + else if (data.raw[NOTIFY_COOKIE_LEN - 1] == NOTIFY_REMOVED) +- /* The only state we keep is the copy of the threadattributes. */
+- free (data.attr); ++ { ++ /* The only state we keep is the copy of the thread attributes. */ ++ pthread_attr_destroy (data.attr); ++ free (data.attr); ++ }meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +4
-0+ } + return NULL; + } +@@ -255,8 +258,14 @@ mq_notify (mqd_t mqdes, const struct sigevent*notification)
meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +7
-0+ if (data.attr == NULL) + return -1; + +- memcpy (data.attr, notification->sigev_notify_attributes, +- sizeof (pthread_attr_t)); ++ int ret = __pthread_attr_copy (data.attr, ++ notification-Quoted 1 line
sigev_notify_attributes);++ if (ret != 0)
++ {++ free (data.attr); ++ __set_errno (ret); ++ return -1;++ }
meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +4
-0+ } + + /* Construct the new request. */ +@@ -269,8 +278,11 @@ mq_notify (mqd_t mqdes, const struct sigevent*notification)
meta/recipes-core/glibc/glibc/CVE-2021-33574.patch new file +13
-0+ int retval = INLINE_SYSCALL (mq_notify, 2, mqdes, &se); + + /* If it failed, free the allocated memory. */ +- if (__glibc_unlikely (retval != 0)) +- free (data.attr); ++ if (retval != 0 && data.attr != NULL) ++ { ++ pthread_attr_destroy (data.attr); ++ free (data.attr); ++ } + + return retval; + }meta/recipes- renamed from meta/recipes-core/glibc/glibc_2.33.bb +0
-0core/glibc/glibc_2.33.bb
index925efe8cc6..e9f01a14c5100644meta/recipes-core/glibc/glibc_2.33.bb +0
-0@@ -57,6 +57,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \file://0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch
\file://0030-powerpc-Do-not-ask-compiler-for-finding-arch.patch \ file://mte-backports.patch \ + file://CVE-2021-33574.patch \ "S = "${WORKDIR}/git"
B = "${WORKDIR}/build-${TARGET_SYS}"