diff options
author | Carlos O'Donell <carlos@redhat.com> | 2017-01-28 19:13:34 -0500 |
---|---|---|
committer | Carlos O'Donell <carlos@redhat.com> | 2017-01-28 19:21:44 -0500 |
commit | f8bf15febcaf137bbec5a61101e88cd5a9d56ca8 (patch) | |
tree | 77e4625039c3eb70b5dad4e1a1dcbb30517f3e60 /support | |
parent | nptl: Add tst-robust-fork (diff) | |
download | glibc-f8bf15febcaf137bbec5a61101e88cd5a9d56ca8.tar.gz glibc-f8bf15febcaf137bbec5a61101e88cd5a9d56ca8.tar.bz2 glibc-f8bf15febcaf137bbec5a61101e88cd5a9d56ca8.zip |
Bug 20116: Fix use after free in pthread_create()
The commit documents the ownership rules around 'struct pthread' and
when a thread can read or write to the descriptor. With those ownership
rules in place it becomes obvious that pd->stopped_start should not be
touched in several of the paths during thread startup, particularly so
for detached threads. In the case of detached threads, between the time
the thread is created by the OS kernel and the creating thread checks
pd->stopped_start, the detached thread might have already exited and the
memory for pd unmapped. As a regression test we add a simple test which
exercises this exact case by quickly creating detached threads with
large enough stacks to ensure the thread stack cache is bypassed and the
stacks are unmapped. Before the fix the testcase segfaults, after the
fix it works correctly and completes without issue.
For a detailed discussion see:
https://www.sourceware.org/ml/libc-alpha/2017-01/msg00505.html
Diffstat (limited to 'support')
-rw-r--r-- | support/Makefile | 4 | ||||
-rw-r--r-- | support/xpthread_attr_destroy.c | 26 | ||||
-rw-r--r-- | support/xpthread_attr_init.c | 25 | ||||
-rw-r--r-- | support/xpthread_attr_setdetachstate.c | 27 | ||||
-rw-r--r-- | support/xpthread_attr_setstacksize.c | 26 | ||||
-rw-r--r-- | support/xthread.h | 6 |
6 files changed, 114 insertions, 0 deletions
diff --git a/support/Makefile b/support/Makefile index 45aa7fcd2d..2ace559ae0 100644 --- a/support/Makefile +++ b/support/Makefile @@ -64,6 +64,10 @@ libsupport-routines = \ xmmap \ xmunmap \ xpoll \ + xpthread_attr_destroy \ + xpthread_attr_init \ + xpthread_attr_setdetachstate \ + xpthread_attr_setstacksize \ xpthread_barrier_destroy \ xpthread_barrier_init \ xpthread_barrier_wait \ diff --git a/support/xpthread_attr_destroy.c b/support/xpthread_attr_destroy.c new file mode 100644 index 0000000000..664c809e9f --- /dev/null +++ b/support/xpthread_attr_destroy.c @@ -0,0 +1,26 @@ +/* pthread_attr_destroy with error checking. + Copyright (C) 2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#include <support/xthread.h> + +void +xpthread_attr_destroy (pthread_attr_t *attr) +{ + xpthread_check_return ("pthread_attr_destroy", + pthread_attr_destroy (attr)); +} diff --git a/support/xpthread_attr_init.c b/support/xpthread_attr_init.c new file mode 100644 index 0000000000..2e30ade9ab --- /dev/null +++ b/support/xpthread_attr_init.c @@ -0,0 +1,25 @@ +/* pthread_attr_init with error checking. + Copyright (C) 2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#include <support/xthread.h> + +void +xpthread_attr_init (pthread_attr_t *attr) +{ + xpthread_check_return ("pthread_attr_init", pthread_attr_init (attr)); +} diff --git a/support/xpthread_attr_setdetachstate.c b/support/xpthread_attr_setdetachstate.c new file mode 100644 index 0000000000..b544dbaa42 --- /dev/null +++ b/support/xpthread_attr_setdetachstate.c @@ -0,0 +1,27 @@ +/* pthread_attr_setdetachstate with error checking. + Copyright (C) 2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#include <support/xthread.h> + +void +xpthread_attr_setdetachstate (pthread_attr_t *attr, int detachstate) +{ + xpthread_check_return ("pthread_attr_setdetachstate", + pthread_attr_setdetachstate (attr, + detachstate)); +} diff --git a/support/xpthread_attr_setstacksize.c b/support/xpthread_attr_setstacksize.c new file mode 100644 index 0000000000..02d06310a9 --- /dev/null +++ b/support/xpthread_attr_setstacksize.c @@ -0,0 +1,26 @@ +/* pthread_attr_setstacksize with error checking. + Copyright (C) 2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#include <support/xthread.h> + +void +xpthread_attr_setstacksize (pthread_attr_t *attr, size_t stacksize) +{ + xpthread_check_return ("pthread_attr_setstacksize", + pthread_attr_setstacksize (attr, stacksize)); +} diff --git a/support/xthread.h b/support/xthread.h index 0eb54fd85a..6dd7e709be 100644 --- a/support/xthread.h +++ b/support/xthread.h @@ -61,6 +61,12 @@ void xpthread_detach (pthread_t thr); void xpthread_cancel (pthread_t thr); void *xpthread_join (pthread_t thr); void xpthread_once (pthread_once_t *guard, void (*func) (void)); +void xpthread_attr_destroy (pthread_attr_t *attr); +void xpthread_attr_init (pthread_attr_t *attr); +void xpthread_attr_setdetachstate (pthread_attr_t *attr, + int detachstate); +void xpthread_attr_setstacksize (pthread_attr_t *attr, + size_t stacksize); /* This function returns non-zero if pthread_barrier_wait returned PTHREAD_BARRIER_SERIAL_THREAD. */ |