mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-27 03:41:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use __pthread_attr_copy in mq_notify (bug 27896)

Browse Source 
Make a deep copy of the pthread attribute object to remove a potential
use-after-free issue.

(cherry picked from commit 42d3593505)
This commit is contained in:
Andreas Schwab 2021-05-27 12:49:47 +02:00 committed by Arjun Shankar
parent 1799ac8eab
commit ff75390ef5
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -208,6 +208,10 @@ Security related changes:
invoked with input containing redundant shift sequences in the IBM1364,
IBM1371, IBM1388, IBM1390, or IBM1399 character sets.
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:
[9809] localedata: ckb_IQ: new Kurdish Sorani locale

15
sysdeps/unix/sysv/linux/mq_notify.c
View File

@ -133,8 +133,11 @@ helper_thread (void *arg)
(void) __pthread_barrier_wait (&notify_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;
}