From 42d359350510506b87101cf77202fefcbfc790cb Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 27 May 2021 12:49:47 +0200 Subject: 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. --- sysdeps/unix/sysv/linux/mq_notify.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'sysdeps/unix/sysv/linux/mq_notify.c') 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; } -- cgit v1.2.3-70-g09d2