70 lines
2.3 KiB
Diff
70 lines
2.3 KiB
Diff
From 42d359350510506b87101cf77202fefcbfc790cb Mon Sep 17 00:00:00 2001
|
|
From: Andreas Schwab <schwab@linux-m68k.org>
|
|
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.
|
|
---
|
|
NEWS | 3 +++
|
|
sysdeps/unix/sysv/linux/mq_notify.c | 15 ++++++++++-----
|
|
2 files changed, 13 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/NEWS b/NEWS
|
|
index 71f5d20..9e5bcf4 100644
|
|
--- a/NEWS
|
|
+++ b/NEWS
|
|
@@ -101,6 +101,9 @@ Changes to build and runtime requirements:
|
|
* s390x requires GCC 7.1 or newer. See gcc Bug 98269.
|
|
|
|
Security related changes:
|
|
+ CVE-2021-33574: The mq_notify function has a potential use-after-free
|
|
+ issue when using a notification type of SIGEV_THREAD and a thread
|
|
+ attribute with a non-default affinity mask.
|
|
|
|
CVE-2021-3326: An assertion failure during conversion from the
|
|
ISO-20220-JP-3 character set using the iconv function has been fixed.
|
|
diff --git a/sysdeps/unix/sysv/linux/mq_notify.c b/sysdeps/unix/sysv/linux/mq_notify.c
|
|
index cc575a0..f7ddfe5 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,7 @@ 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));
|
|
+ __pthread_attr_copy (data.attr, notification->sigev_notify_attributes);
|
|
}
|
|
|
|
/* Construct the new request. */
|
|
@@ -270,7 +272,10 @@ mq_notify (mqd_t mqdes, const struct sigevent *notification)
|
|
|
|
/* If it failed, free the allocated memory. */
|
|
if (__glibc_unlikely (retval != 0))
|
|
- free (data.attr);
|
|
+ {
|
|
+ pthread_attr_destroy (data.attr);
|
|
+ free (data.attr);
|
|
+ }
|
|
|
|
return retval;
|
|
}
|
|
--
|
|
1.8.3.1
|
|
|