diff options
author | Daniel J Blueman <daniel.blueman@gmail.com> | 2010-11-09 15:33:02 -0500 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2010-11-10 08:40:53 -0500 |
commit | 1447399b3e34af016c368b4178db7ef0e04e15b0 (patch) | |
tree | e5de50c5520b2c20359c2afbf903e052b88bb995 /fs/ioprio.c | |
parent | a014741c0adfb8fb79952939ca087cf03d272bb9 (diff) |
ioprio: fix RCU locking around task dereference
With 2.6.37-rc1, I observe sys_ioprio_set not taking the RCU lock [1]
across access to the task credentials.
Inspecting the code in fs/ioprio.c, the tasklist_lock is held for read
across the __task_cred call, which is presumably sufficient to prevent
the task credentials becoming stale.
===================================================
[ INFO: suspicious rcu_dereference_check() usage. ]
---------------------------------------------------
kernel/pid.c:419 invoked rcu_dereference_check() without protection!
other info that might help us debug this:
rcu_scheduler_active = 1, debug_locks = 1
1 lock held by start-stop-daem/2246:
#0: (tasklist_lock){.?.?..}, at: [<ffffffff811a2dfa>]
sys_ioprio_set+0x8a/0x400
stack backtrace:
Pid: 2246, comm: start-stop-daem Not tainted 2.6.37-rc1-330cd+ #2
Call Trace:
[<ffffffff8109f5f4>] lockdep_rcu_dereference+0xa4/0xc0
[<ffffffff81085651>] find_task_by_pid_ns+0x81/0x90
[<ffffffff8108567d>] find_task_by_vpid+0x1d/0x20
[<ffffffff811a3160>] sys_ioprio_set+0x3f0/0x400
[<ffffffff816efa79>] ? trace_hardirqs_on_thunk+0x3a/0x3f
[<ffffffff81003482>] system_call_fastpath+0x16/0x1b
Take the RCU lock for read across acquiring the pointer to the task
credentials and dereferencing it.
Signed-off-by: Daniel J Blueman <daniel.blueman@gmail.com>
Fixed up by Jens to fix missing rcu_read_unlock() on mismatches.
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'fs/ioprio.c')
-rw-r--r-- | fs/ioprio.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/fs/ioprio.c b/fs/ioprio.c index 748cfb92dcc6..8def14e24c37 100644 --- a/fs/ioprio.c +++ b/fs/ioprio.c | |||
@@ -139,7 +139,12 @@ SYSCALL_DEFINE3(ioprio_set, int, which, int, who, int, ioprio) | |||
139 | break; | 139 | break; |
140 | 140 | ||
141 | do_each_thread(g, p) { | 141 | do_each_thread(g, p) { |
142 | if (__task_cred(p)->uid != who) | 142 | int match; |
143 | |||
144 | rcu_read_lock(); | ||
145 | match = __task_cred(p)->uid == who; | ||
146 | rcu_read_unlock(); | ||
147 | if (!match) | ||
143 | continue; | 148 | continue; |
144 | ret = set_task_ioprio(p, ioprio); | 149 | ret = set_task_ioprio(p, ioprio); |
145 | if (ret) | 150 | if (ret) |
@@ -232,7 +237,12 @@ SYSCALL_DEFINE2(ioprio_get, int, which, int, who) | |||
232 | break; | 237 | break; |
233 | 238 | ||
234 | do_each_thread(g, p) { | 239 | do_each_thread(g, p) { |
235 | if (__task_cred(p)->uid != user->uid) | 240 | int match; |
241 | |||
242 | rcu_read_lock(); | ||
243 | match = __task_cred(p)->uid == user->uid; | ||
244 | rcu_read_unlock(); | ||
245 | if (!match) | ||
236 | continue; | 246 | continue; |
237 | tmpio = get_task_ioprio(p); | 247 | tmpio = get_task_ioprio(p); |
238 | if (tmpio < 0) | 248 | if (tmpio < 0) |