diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2011-11-09 17:15:51 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2011-11-09 17:15:51 +0000 |
| commit | c8997bf02ac41549392905cc4b2d7cbaa113c67e (patch) | |
| tree | 1d0d681736cadd42702eb0ad1ed9912c4d51c96e /sys/fs/procfs | |
| parent | ebd2498cdf87678657628731b6aecfe8295b6535 (diff) | |
| download | src-c8997bf02ac41549392905cc4b2d7cbaa113c67e.tar.gz src-c8997bf02ac41549392905cc4b2d7cbaa113c67e.zip | |
Lock the thread lock around block that retrieves td_wmesg. Otherwise,
procfs could see a thread with assigned td_wchan but still NULL td_wmesg.
Reported and tested by: pho
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=227393
Diffstat (limited to 'sys/fs/procfs')
| -rw-r--r-- | sys/fs/procfs/procfs_status.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/fs/procfs/procfs_status.c b/sys/fs/procfs/procfs_status.c index 62651cb67908..4bfa06f2f43f 100644 --- a/sys/fs/procfs/procfs_status.c +++ b/sys/fs/procfs/procfs_status.c @@ -113,12 +113,14 @@ procfs_doprocstatus(PFS_FILL_ARGS) } tdfirst = FIRST_THREAD_IN_PROC(p); + thread_lock(tdfirst); if (tdfirst->td_wchan != NULL) { KASSERT(tdfirst->td_wmesg != NULL, ("wchan %p has no wmesg", tdfirst->td_wchan)); wmesg = tdfirst->td_wmesg; } else wmesg = "nochan"; + thread_unlock(tdfirst); if (p->p_flag & P_INMEM) { struct timeval start, ut, st; |