mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

blktrace: fix trace mutex deadlock

Browse Source 
A previous commit changed the locking around registration/cleanup,
but direct callers of blk_trace_remove() were missed. This means
that if we hit the error path in setup, we will deadlock on
attempting to re-acquire the queue trace mutex.

Fixes: 1f2cac107c ("blktrace: fix unlocked access to init/start-stop/teardown")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe
2017-11-19 11:52:55 -07:00
parent 6c4ca1e36c
commit 2967acbb25
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/trace/blktrace.c
View File

@@ -591,7 +591,7 @@ static int __blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
return ret; return ret;
if (copy_to_user(arg, &buts, sizeof(buts))) { if (copy_to_user(arg, &buts, sizeof(buts))) {
blk_trace_remove(q); __blk_trace_remove(q);
return -EFAULT; return -EFAULT;
} }
return 0; return 0;
@@ -637,7 +637,7 @@ static int compat_blk_trace_setup(struct request_queue *q, char *name,
return ret; return ret;
if (copy_to_user(arg, &buts.name, ARRAY_SIZE(buts.name))) { if (copy_to_user(arg, &buts.name, ARRAY_SIZE(buts.name))) {
blk_trace_remove(q); __blk_trace_remove(q);
return -EFAULT; return -EFAULT;
} }