浏览代码

blktrace: don't let the sysfs interface remove trace from running list

Currently, blktrace can be started/stopped via its ioctl-based interface
(used by the userspace blktrace tool) or via its ftrace interface. The
function blk_trace_remove_queue(), called each time an "enable" tunable
of the ftrace interface transitions to zero, removes the trace from the
running list, even if no function from the sysfs interface adds it to
such a list. This leads to a null pointer dereference.  This commit
changes the blk_trace_remove_queue() function so that it does not remove
the blk_trace from the running list.

v2:
    - Now the patch removes the invocation of list_del() instead of
      adding an useless if branch, as suggested by Namhyung Kim.

Signed-off-by: Arianna Avanzini <avanzini.arianna@gmail.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Arianna Avanzini 10 年之前
父节点
当前提交
7eca210375
共有 1 个文件被更改,包括 0 次插入3 次删除
  1. 0 3
      kernel/trace/blktrace.c

+ 0 - 3
kernel/trace/blktrace.c

@@ -1493,9 +1493,6 @@ static int blk_trace_remove_queue(struct request_queue *q)
 	if (atomic_dec_and_test(&blk_probes_ref))
 	if (atomic_dec_and_test(&blk_probes_ref))
 		blk_unregister_tracepoints();
 		blk_unregister_tracepoints();
 
 
-	spin_lock_irq(&running_trace_lock);
-	list_del(&bt->running_list);
-	spin_unlock_irq(&running_trace_lock);
 	blk_trace_free(bt);
 	blk_trace_free(bt);
 	return 0;
 	return 0;
 }
 }