summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2017-11-19 11:52:55 -0700
committerJens Axboe <axboe@kernel.dk>2017-11-27 12:03:58 -0700
commit2967acbb257a6a9bf912f4778b727e00972eac9b (patch)
treebe2c900c9cdf5616713f21b8bb3c2d4f34426fee /kernel
parent6c4ca1e36cdc1a0a7a84797804b87920ccbebf51 (diff)
downloadlinux-2967acbb257a6a9bf912f4778b727e00972eac9b.tar.gz
linux-2967acbb257a6a9bf912f4778b727e00972eac9b.tar.bz2
linux-2967acbb257a6a9bf912f4778b727e00972eac9b.zip
blktrace: fix trace mutex deadlock
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: 1f2cac107c59 ("blktrace: fix unlocked access to init/start-stop/teardown") Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/blktrace.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index c5987d4c5f23..987d9a9ae283 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -591,7 +591,7 @@ static int __blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
return ret;
if (copy_to_user(arg, &buts, sizeof(buts))) {
- blk_trace_remove(q);
+ __blk_trace_remove(q);
return -EFAULT;
}
return 0;
@@ -637,7 +637,7 @@ static int compat_blk_trace_setup(struct request_queue *q, char *name,
return ret;
if (copy_to_user(arg, &buts.name, ARRAY_SIZE(buts.name))) {
- blk_trace_remove(q);
+ __blk_trace_remove(q);
return -EFAULT;
}