diff options
| author | kib <kib@FreeBSD.org> | 2016-06-25 11:31:25 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2016-06-25 11:31:25 +0000 |
| commit | 72cb649e6eb622e09986f100386cb6e1315d8f91 (patch) | |
| tree | 8b8cce27d7fe0e56c7abed9e8d9790d5369b4b47 | |
| parent | 75248c1348fc1956c29fe50cf18ddccf5b99ca30 (diff) | |
| download | FreeBSD-src-72cb649e6eb622e09986f100386cb6e1315d8f91.zip FreeBSD-src-72cb649e6eb622e09986f100386cb6e1315d8f91.tar.gz | |
Do not clear robust lists pointers on fork. The forked child thread
lists must be functional.
Reported by: Daniel Engberg <daniel.engberg.lists@pyret.net>,
Guy Yur <guyyur@gmail.com>
Tested by: Guy Yur <guyyur@gmail.com>
Sponsored by: The FreeBSD Foundation
Approved by: re (gjb), including the KBI change
| -rw-r--r-- | sys/kern/kern_thr.c | 1 | ||||
| -rw-r--r-- | sys/sys/proc.h | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/kern/kern_thr.c b/sys/kern/kern_thr.c index 10ccdab..293574c 100644 --- a/sys/kern/kern_thr.c +++ b/sys/kern/kern_thr.c @@ -234,6 +234,7 @@ thread_create(struct thread *td, struct rtprio *rtp, bcopy(&td->td_startcopy, &newtd->td_startcopy, __rangeof(struct thread, td_startcopy, td_endcopy)); newtd->td_proc = td->td_proc; + newtd->td_rb_list = newtd->td_rbp_list = newtd->td_rb_inact = 0; thread_cow_get(newtd, td); error = initialize_thread(newtd, thunk); diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 6d03062..6162a16 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -282,9 +282,6 @@ struct thread { int td_no_sleeping; /* (k) Sleeping disabled count. */ int td_dom_rr_idx; /* (k) RR Numa domain selection. */ void *td_su; /* (k) FFS SU private */ - uintptr_t td_rb_list; /* (k) Robust list head. */ - uintptr_t td_rbp_list; /* (k) Robust priv list head. */ - uintptr_t td_rb_inact; /* (k) Current in-action mutex loc. */ #define td_endzero td_sigmask /* Copied during fork1() or create_thread(). */ @@ -298,6 +295,9 @@ struct thread { u_char td_base_user_pri; /* (t) Base user pri */ u_int td_dbg_sc_code; /* (c) Syscall code to debugger. */ u_int td_dbg_sc_narg; /* (c) Syscall arg count to debugger.*/ + uintptr_t td_rb_list; /* (k) Robust list head. */ + uintptr_t td_rbp_list; /* (k) Robust priv list head. */ + uintptr_t td_rb_inact; /* (k) Current in-action mutex loc. */ #define td_endcopy td_pcb /* |
