blob: 1e94049004e3e748abfd51ab40a55971090bce4e [file] [log] [blame]
Andrew Geisslerd159c7f2021-09-02 21:05:58 -05001From b805aebd42364fe696e417808a700fdb9800c9e8 Mon Sep 17 00:00:00 2001
2From: Nikita Popov <npv1310@gmail.com>
3Date: Mon, 9 Aug 2021 20:17:34 +0530
4Subject: [PATCH] librt: fix NULL pointer dereference (bug 28213)
5
6Helper thread frees copied attribute on NOTIFY_REMOVED message
7received from the OS kernel. Unfortunately, it fails to check whether
8copied attribute actually exists (data.attr != NULL). This worked
9earlier because free() checks passed pointer before actually
10attempting to release corresponding memory. But
11__pthread_attr_destroy assumes pointer is not NULL.
12
13So passing NULL pointer to __pthread_attr_destroy will result in
14segmentation fault. This scenario is possible if
15notification->sigev_notify_attributes == NULL (which means default
16thread attributes should be used).
17
18Upstream-Status: Backport [https://sourceware.org/git/?p=glibc.git;a=commit;h=b805aebd42364fe696e417808a700fdb9800c9e8]
19CVE: CVE-2021-38604
20
21Signed-off-by: Nikita Popov <npv1310@gmail.com>
22Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
23Signed-off-by: Vinay Kumar <vinay.m.engg@gmail.com>
24---
25 sysdeps/unix/sysv/linux/mq_notify.c | 2 +-
26 1 file changed, 1 insertion(+), 1 deletion(-)
27
28diff --git a/sysdeps/unix/sysv/linux/mq_notify.c b/sysdeps/unix/sysv/linux/mq_notify.c
29index 9799dcdaa4..eccae2e4c6 100644
30--- a/sysdeps/unix/sysv/linux/mq_notify.c
31+++ b/sysdeps/unix/sysv/linux/mq_notify.c
32@@ -131,7 +131,7 @@ helper_thread (void *arg)
33 to wait until it is done with it. */
34 (void) __pthread_barrier_wait (&notify_barrier);
35 }
36- else if (data.raw[NOTIFY_COOKIE_LEN - 1] == NOTIFY_REMOVED)
37+ else if (data.raw[NOTIFY_COOKIE_LEN - 1] == NOTIFY_REMOVED && data.attr != NULL)
38 {
39 /* The only state we keep is the copy of the thread attributes. */
40 __pthread_attr_destroy (data.attr);
41--
422.31.1
43