Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753859AbaKHPOq (ORCPT ); Sat, 8 Nov 2014 10:14:46 -0500 Received: from mail-wg0-f51.google.com ([74.125.82.51]:49441 "EHLO mail-wg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753793AbaKHPOo (ORCPT ); Sat, 8 Nov 2014 10:14:44 -0500 From: Arianna Avanzini To: rostedt@goodmis.org, mingo@redhat.com, linux-kernel@vger.kernel.org Cc: avanzini.arianna@gmail.com Subject: [PATCH RFC] trace, blktrace: remove trace from running list only if trace is running Date: Sat, 8 Nov 2014 16:14:40 +0100 Message-Id: <1415459680-1749-1-git-send-email-avanzini.arianna@gmail.com> X-Mailer: git-send-email 2.1.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 unconditionally the trace from the running list, even if its state is not Blktrace_running. In fact, the state of a blk_trace is modified only by the ioctl-based interface, and a blk_trace is added to the running list only when its state transitions from Blktrace_setup or Blktrace_stopped to Blktrace_running. If the ioctl-based interface is not being used, the state of the blk_trace is undefined. In this case, using the sysfs tunable to stop a trace would trigger a removal of a blk_trace from the running list while it is not on such a list, leading to a null pointer dereference. This commit attempts to fix the issue by letting the blk_trace_remove_queue() function remove the blk_trace from the running list only if its state is Blktrace_running. Signed-off-by: Arianna Avanzini --- kernel/trace/blktrace.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index c1bd4ad..f58b617 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -1493,9 +1493,11 @@ static int blk_trace_remove_queue(struct request_queue *q) if (atomic_dec_and_test(&blk_probes_ref)) blk_unregister_tracepoints(); - spin_lock_irq(&running_trace_lock); - list_del(&bt->running_list); - spin_unlock_irq(&running_trace_lock); + if (bt->trace_state == Blktrace_running) { + spin_lock_irq(&running_trace_lock); + list_del(&bt->running_list); + spin_unlock_irq(&running_trace_lock); + } blk_trace_free(bt); return 0; } -- 2.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/