diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-06-01 17:51:41 +0200 |
|---|---|---|
| committer | Arjun Shankar <arjun@redhat.com> | 2021-06-10 14:28:20 +0200 |
| commit | 16949aeaa078b5994a333980d7a6cd5705d5e1f7 (patch) | |
| tree | bca0e757449ebb2b2f4db8ce002e743e47f7bb62 | |
| parent | ff75390ef59823193351ae77584c397c503b7b58 (diff) | |
| download | glibc-16949aeaa078b5994a333980d7a6cd5705d5e1f7.tar glibc-16949aeaa078b5994a333980d7a6cd5705d5e1f7.tar.gz glibc-16949aeaa078b5994a333980d7a6cd5705d5e1f7.tar.bz2 glibc-16949aeaa078b5994a333980d7a6cd5705d5e1f7.zip | |
Fix use of __pthread_attr_copy in mq_notify (bug 27896)
__pthread_attr_copy can fail and does not initialize the attribute
structure in that case.
If __pthread_attr_copy is never called and there is no allocated
attribute, pthread_attr_destroy should not be called, otherwise
there is a null pointer dereference in rt/tst-mqueue6.
Fixes commit 42d359350510506b87101cf77202fefcbfc790cb
("Use __pthread_attr_copy in mq_notify (bug 27896)").
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
(cherry picked from commit 217b6dc298156bdb0d6aea9ea93e7e394a5ff091)
| -rw-r--r-- | sysdeps/unix/sysv/linux/mq_notify.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/mq_notify.c b/sysdeps/unix/sysv/linux/mq_notify.c index f404acfdfe..b5a903c3a2 100644 --- a/sysdeps/unix/sysv/linux/mq_notify.c +++ b/sysdeps/unix/sysv/linux/mq_notify.c @@ -258,7 +258,14 @@ mq_notify (mqd_t mqdes, const struct sigevent *notification) if (data.attr == NULL) return -1; - __pthread_attr_copy (data.attr, notification->sigev_notify_attributes); + 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. */ @@ -271,7 +278,7 @@ 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)) + if (retval != 0 && data.attr != NULL) { pthread_attr_destroy (data.attr); free (data.attr); |