From patchwork Fri Nov 14 11:21:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Thompson X-Patchwork-Id: 40809 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A3912240ED for ; Fri, 14 Nov 2014 11:21:56 +0000 (UTC) Received: by mail-la0-f72.google.com with SMTP id mc6sf10235336lab.3 for ; Fri, 14 Nov 2014 03:21:55 -0800 (PST) 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=kVFsg3Bmpl0qccR0N77jJIqr/gCVmM5pI4/qvq6Isbw=; b=ZG2EFO9H1uPx4Icq60fics3yJkk6WPjT/Hd3f+jB4Y7U/1jShHqo/YyB9rzCoTY3Br S3L2ADTZLKgOAU7pX8zH7MmRYGPotGrlBeel0hDmVHOd3qIijojIWPJH5GhF9EAogDpR /2vhhsw+r2Om8Uc9dQlTrVKUtTfrnENyFqnEVXWVuq8X4v9hND/DqApi1GFgdRMDzOmz Au2PbFH1ykWpoe9ev2aQfsx7dGFHN6F2rvEk08T4/VcXZN1xHvEOV9UcAKEVFKysANir jwc1LnHJvInrj5uZR/9RigfJghJZZre1kCyWF6lz9fDKHFxK8uaI2yoZmDnsqio3AsFq QNgg== X-Gm-Message-State: ALoCoQneIONfoMnJSOumQdd2ih4jl1Yq6TdsO+7/w4lUzGo1y1oSAHB36z0rMfl3OyNNvR1ZDniI X-Received: by 10.112.188.199 with SMTP id gc7mr5364912lbc.6.1415964115573; Fri, 14 Nov 2014 03:21:55 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.138 with SMTP id q10ls952075laj.83.gmail; Fri, 14 Nov 2014 03:21:55 -0800 (PST) X-Received: by 10.112.144.228 with SMTP id sp4mr7587680lbb.58.1415964115357; Fri, 14 Nov 2014 03:21:55 -0800 (PST) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id qf5si41246956lbb.105.2014.11.14.03.21.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 14 Nov 2014 03:21:55 -0800 (PST) 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 gm9so15039306lab.33 for ; Fri, 14 Nov 2014 03:21:55 -0800 (PST) X-Received: by 10.112.62.166 with SMTP id z6mr2168461lbr.74.1415964115239; Fri, 14 Nov 2014 03:21:55 -0800 (PST) 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.184.201 with SMTP id ew9csp747449lbc; Fri, 14 Nov 2014 03:21:54 -0800 (PST) X-Received: by 10.194.92.116 with SMTP id cl20mr13059935wjb.71.1415964114397; Fri, 14 Nov 2014 03:21:54 -0800 (PST) Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com. [209.85.212.176]) by mx.google.com with ESMTPS id p10si3205230wia.64.2014.11.14.03.21.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 14 Nov 2014 03:21:54 -0800 (PST) Received-SPF: pass (google.com: domain of daniel.thompson@linaro.org designates 209.85.212.176 as permitted sender) client-ip=209.85.212.176; Received: by mail-wi0-f176.google.com with SMTP id ex7so2333078wid.9 for ; Fri, 14 Nov 2014 03:21:54 -0800 (PST) X-Received: by 10.194.81.38 with SMTP id w6mr12870120wjx.17.1415964114115; Fri, 14 Nov 2014 03:21:54 -0800 (PST) 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 p3sm39228147wjf.49.2014.11.14.03.21.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Nov 2014 03:21:53 -0800 (PST) From: Daniel Thompson To: Steven Rostedt , Ingo Molnar Cc: Daniel Thompson , kgdb-bugreport@lists.sourceforge.net, linux-kernel@vger.kernel.org, Andrew Morton , patches@linaro.org, linaro-kernel@lists.linaro.org, John Stultz , Sumit Semwal , Jason Wessel Subject: [PATCH 3.18-rc3 v3 1/2] trace: kdb: Fix kernel panic during ftdump Date: Fri, 14 Nov 2014 11:21:22 +0000 Message-Id: <1415964083-10354-2-git-send-email-daniel.thompson@linaro.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1415964083-10354-1-git-send-email-daniel.thompson@linaro.org> References: <1415277716-19419-1-git-send-email-daniel.thompson@linaro.org> <1415964083-10354-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 is a regression, albeit a fairly elderly one. It was introduced by commit 6d158a813efc ("tracing: Remove NR_CPUS array from trace_iterator"). 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 bd90e1b06088..8faa7ce58814 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; + } + } } /*