* [PATCH] Use __pthread_attr_copy in mq_notify (bug 27896)
@ 2021-06-01 8:50 Andreas Schwab
2021-06-01 13:55 ` Siddhesh Poyarekar
0 siblings, 1 reply; 2+ messages in thread
From: Andreas Schwab @ 2021-06-01 8:50 UTC (permalink / raw)
To: libc-alpha
Make a deep copy of the pthread attribute object to remove a potential
use-after-free issue.
---
NEWS | 4 ++++
sysdeps/unix/sysv/linux/mq_notify.c | 15 ++++++++++-----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/NEWS b/NEWS
index 266837bf2d..4460752df7 100644
--- a/NEWS
+++ b/NEWS
@@ -56,6 +56,10 @@ Security related changes:
potentially resulting in degraded service or Denial of Service on the
local system. Reported by Chris Schanzle.
+ 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.
+
The following bugs are resolved with this release:
[The release manager will add the list generated by
diff --git a/sysdeps/unix/sysv/linux/mq_notify.c b/sysdeps/unix/sysv/linux/mq_notify.c
index cc575a0cdd..f7ddfe5a6c 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;
}
--
2.31.1
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1
"And now for something completely different."
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Use __pthread_attr_copy in mq_notify (bug 27896)
2021-06-01 8:50 [PATCH] Use __pthread_attr_copy in mq_notify (bug 27896) Andreas Schwab
@ 2021-06-01 13:55 ` Siddhesh Poyarekar
0 siblings, 0 replies; 2+ messages in thread
From: Siddhesh Poyarekar @ 2021-06-01 13:55 UTC (permalink / raw)
To: Andreas Schwab, libc-alpha
On 6/1/21 2:20 PM, Andreas Schwab wrote:
> Make a deep copy of the pthread attribute object to remove a potential
> use-after-free issue.
LGTM
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
> ---
> NEWS | 4 ++++
> sysdeps/unix/sysv/linux/mq_notify.c | 15 ++++++++++-----
> 2 files changed, 14 insertions(+), 5 deletions(-)
>
> diff --git a/NEWS b/NEWS
> index 266837bf2d..4460752df7 100644
> --- a/NEWS
> +++ b/NEWS
> @@ -56,6 +56,10 @@ Security related changes:
> potentially resulting in degraded service or Denial of Service on the
> local system. Reported by Chris Schanzle.
>
> + 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.
> +
> The following bugs are resolved with this release:
>
> [The release manager will add the list generated by
> diff --git a/sysdeps/unix/sysv/linux/mq_notify.c b/sysdeps/unix/sysv/linux/mq_notify.c
> index cc575a0cdd..f7ddfe5a6c 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;
> }
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-01 14:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-01 8:50 [PATCH] Use __pthread_attr_copy in mq_notify (bug 27896) Andreas Schwab
2021-06-01 13:55 ` Siddhesh Poyarekar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).