From patchwork Wed Sep 24 10:33:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Thompson X-Patchwork-Id: 37799 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1A28C202DB for ; Wed, 24 Sep 2014 10:33:22 +0000 (UTC) Received: by mail-lb0-f199.google.com with SMTP id z12sf2890484lbi.6 for ; Wed, 24 Sep 2014 03:33:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=BifI1H4n44Tc4mbfob84fgCRr3b/eL5xvGXrlMynPF4=; b=JzvN2Za3z6IejGcmgWix/LTnkn8Nu0S3YICwQS69A/U4aRrRXfn5z2rAcye/1DNlRe ralK99VaGGGHOY9KtmdvQUuX8GmDRGhogET8CiJNWxxRp0MIc/SMPK1gdyB7O0k7uErW NCaSAbk/gtKi/3NcSvlOk9ubxJYVSHPfc8chL5iUFMDGtY+BTefu0o78bwrDx8E6qrsC JvHwDI9BqHuOoHNryE5oJxH0F/AY0G6HCZk41indhqgGO5UfwrQrQvBwakedJt/riib+ DkrD2gRSRZy0ZrGOIf09Zy+jmFj1uj7idf/uPA/lr9mpwA9IIdoT/3WxQ5FBAIfjv/NI sxoA== X-Gm-Message-State: ALoCoQn2aFagxAMrUmvkDJo4XRtDY9HfDLcJ2PBXZjnijWTi8Dfr4xaP2K8ewuRtNd3LK55rnpcu X-Received: by 10.112.162.138 with SMTP id ya10mr194020lbb.21.1411554801896; Wed, 24 Sep 2014 03:33:21 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.44.165 with SMTP id f5ls150799lam.33.gmail; Wed, 24 Sep 2014 03:33:21 -0700 (PDT) X-Received: by 10.152.170.167 with SMTP id an7mr2305439lac.94.1411554801755; Wed, 24 Sep 2014 03:33:21 -0700 (PDT) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com [209.85.215.46]) by mx.google.com with ESMTPS id gk7si22298081lbc.43.2014.09.24.03.33.21 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 24 Sep 2014 03:33:21 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by mail-la0-f46.google.com with SMTP id gi9so56052lab.19 for ; Wed, 24 Sep 2014 03:33:21 -0700 (PDT) X-Received: by 10.112.200.134 with SMTP id js6mr5350773lbc.0.1411554801635; Wed, 24 Sep 2014 03:33:21 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.130.169 with SMTP id of9csp558684lbb; Wed, 24 Sep 2014 03:33:21 -0700 (PDT) X-Received: by 10.194.250.103 with SMTP id zb7mr7065668wjc.52.1411554801022; Wed, 24 Sep 2014 03:33:21 -0700 (PDT) Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by mx.google.com with ESMTPS id wg9si1382924wjb.70.2014.09.24.03.33.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 24 Sep 2014 03:33:21 -0700 (PDT) Received-SPF: pass (google.com: domain of daniel.thompson@linaro.org designates 209.85.212.175 as permitted sender) client-ip=209.85.212.175; Received: by mail-wi0-f175.google.com with SMTP id r20so6616318wiv.8 for ; Wed, 24 Sep 2014 03:33:20 -0700 (PDT) X-Received: by 10.180.186.230 with SMTP id fn6mr30354089wic.44.1411554800809; Wed, 24 Sep 2014 03:33:20 -0700 (PDT) Received: from sundance.lan (cpc4-aztw19-0-0-cust157.18-1.cable.virginm.net. [82.33.25.158]) by mx.google.com with ESMTPSA id ju1sm18977110wjc.1.2014.09.24.03.33.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Sep 2014 03:33:19 -0700 (PDT) From: Daniel Thompson To: Steven Rostedt , Ingo Molnar Cc: Daniel Thompson , linux-kernel@vger.kernel.org, patches@linaro.org, linaro-kernel@lists.linaro.org, John Stultz , Sumit Semwal , kgdb-bugreport@lists.sourceforge.net, Jason Wessel Subject: [PATCH 3.17-rc4 v2 1/2] trace: kdb: Fix kernel panic during ftdump Date: Wed, 24 Sep 2014 11:33:00 +0100 Message-Id: <1411554781-16751-2-git-send-email-daniel.thompson@linaro.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1411554781-16751-1-git-send-email-daniel.thompson@linaro.org> References: <1410360247-13791-1-git-send-email-daniel.thompson@linaro.org> <1411554781-16751-1-git-send-email-daniel.thompson@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: daniel.thompson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Currently kdb's ftdump command unconditionally crashes due to a null pointer de-reference whenever the command is run. This in turn causes the kernel to panic. The abridged stacktrace (gathered with ARCH=arm) is: --- cut here --- [] (panic) from [] (die+0x264/0x440) [] (die) from [] (__do_kernel_fault.part.11+0x74/0x84) [] (__do_kernel_fault.part.11) from [] (do_page_fault+0x1d0/0x3c4) [] (do_page_fault) from [] (do_DataAbort+0x48/0xac) [] (do_DataAbort) from [] (__dabt_svc+0x38/0x60) Exception stack(0xc0deba88 to 0xc0debad0) ba80: e8c29180 00000001 e9854304 e9854300 c0f567d8 c0df2580 baa0: 00000000 00000000 00000000 c0f117b8 c0e3a3c0 c0debb0c 00000000 c0debad0 bac0: 0000672e c02f4d60 60000193 ffffffff [] (__dabt_svc) from [] (kdb_ftdump+0x1e4/0x3d8) [] (kdb_ftdump) from [] (kdb_parse+0x2b8/0x698) [] (kdb_parse) from [] (kdb_main_loop+0x52c/0x784) [] (kdb_main_loop) from [] (kdb_stub+0x238/0x490) --- cut here --- The NULL deref occurs due to the initialized use of struct trace_iter's buffer_iter member. This patch solves this by providing a collection of ring_buffer_iter(s) and using this to initialize buffer_iter. Note that static allocation is used solely because the trace_iter itself is also static allocated. Static allocation also means that we have to NULL-ify the pointer during cleanup to avoid use-after-free problems. Signed-off-by: Daniel Thompson Cc: Jason Wessel Cc: Steven Rostedt Cc: Ingo Molnar --- kernel/trace/trace_kdb.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/kernel/trace/trace_kdb.c b/kernel/trace/trace_kdb.c index bd90e1b..8faa7ce 100644 --- a/kernel/trace/trace_kdb.c +++ b/kernel/trace/trace_kdb.c @@ -20,10 +20,12 @@ static void ftrace_dump_buf(int skip_lines, long cpu_file) { /* use static because iter can be a bit big for the stack */ static struct trace_iterator iter; + static struct ring_buffer_iter *buffer_iter[CONFIG_NR_CPUS]; unsigned int old_userobj; int cnt = 0, cpu; trace_init_global_iter(&iter); + iter.buffer_iter = buffer_iter; for_each_tracing_cpu(cpu) { atomic_inc(&per_cpu_ptr(iter.trace_buffer->data, cpu)->disabled); @@ -86,9 +88,12 @@ out: atomic_dec(&per_cpu_ptr(iter.trace_buffer->data, cpu)->disabled); } - for_each_tracing_cpu(cpu) - if (iter.buffer_iter[cpu]) + for_each_tracing_cpu(cpu) { + if (iter.buffer_iter[cpu]) { ring_buffer_read_finish(iter.buffer_iter[cpu]); + iter.buffer_iter[cpu] = NULL; + } + } } /*