authorgravatar for travislange12@gmail.comTCROC <travislange12@gmail.com> 2025-03-13 16:23:27-04:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-03-14 21:19:17+01:00
logdc75a64c468c99f801af47b7a0dfc76121a46e8b
treeab4deeec2a82f6d02a9babababee5baab6cf0b69
parentfdc9326868d8ab68bfa540167175287282636b08
signaturebadge-check Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

glibc: fix uninitialized memory in __pthread_cond_s for <=2.40

* https://sourceware.org/bugzilla/show_bug.cgi?id=32786 * https://inbox.sourceware.org/libc-alpha/87zfhpfqsm.fsf@oldenburg.str.redhat.com

4 files changed, 6 insertions(+), 2 deletions(-)

lib/libc/glibc/sysdeps/nptl/bits/thread-shared-types.h+2
...@@ -99,6 +99,8 @@ struct __pthread_cond_s...@@ -99,6 +99,8 @@ struct __pthread_cond_s
99 unsigned int __g1_orig_size;99 unsigned int __g1_orig_size;
100 unsigned int __wrefs;100 unsigned int __wrefs;
101 unsigned int __g_signals[2];101 unsigned int __g_signals[2];
102 unsigned int __unused_initialized_1;
103 unsigned int __unused_initialized_2;
102};104};
103105
104typedef unsigned int __tss_t;106typedef unsigned int __tss_t;
lib/libc/glibc/sysdeps/nptl/pthread.h+1-1
...@@ -152,7 +152,7 @@ enum...@@ -152,7 +152,7 @@ enum
152152
153153
154/* Conditional variable handling. */154/* Conditional variable handling. */
155#define PTHREAD_COND_INITIALIZER { { {0}, {0}, {0, 0}, 0, 0, {0, 0} } }155#define PTHREAD_COND_INITIALIZER { { {0}, {0}, {0, 0}, 0, 0, {0, 0}, 0, 0 } }
156156
157157
158/* Cleanup buffers */158/* Cleanup buffers */
lib/libc/include/generic-glibc/bits/thread-shared-types.h+2
...@@ -99,6 +99,8 @@ struct __pthread_cond_s...@@ -99,6 +99,8 @@ struct __pthread_cond_s
99 unsigned int __g1_orig_size;99 unsigned int __g1_orig_size;
100 unsigned int __wrefs;100 unsigned int __wrefs;
101 unsigned int __g_signals[2];101 unsigned int __g_signals[2];
102 unsigned int __unused_initialized_1;
103 unsigned int __unused_initialized_2;
102};104};
103105
104typedef unsigned int __tss_t;106typedef unsigned int __tss_t;
lib/libc/include/generic-glibc/pthread.h+1-1
...@@ -152,7 +152,7 @@ enum...@@ -152,7 +152,7 @@ enum
152152
153153
154/* Conditional variable handling. */154/* Conditional variable handling. */
155#define PTHREAD_COND_INITIALIZER { { {0}, {0}, {0, 0}, 0, 0, {0, 0} } }155#define PTHREAD_COND_INITIALIZER { { {0}, {0}, {0, 0}, 0, 0, {0, 0}, 0, 0 } }
156156
157157
158/* Cleanup buffers */158/* Cleanup buffers */