From patchwork Mon Jun 18 15:30:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zubin Mithra X-Patchwork-Id: 10472091 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A415E6029B for ; Mon, 18 Jun 2018 15:31:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9391128A32 for ; Mon, 18 Jun 2018 15:31:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 87E8D28A39; Mon, 18 Jun 2018 15:31:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DC3F028A32 for ; Mon, 18 Jun 2018 15:31:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=oocfzvZZQL9fn0EzrXZEhoGbAwxRY3SI64u0PHgNmeI=; b=iye1rrjUAuPJrLcUWI6NKccI5/ hjMgynw+X7IBbXj5ryJ+yf+y0NpXrQRPky98E2UN/3TIO+h1NzHhGoinfr2+9t4LclnUoAJ38dTAq Swj7BgBDWEousXO1rmGOGva9t7qimQluoj69ipMRvQA59Exh+zYAY3XAA2jkAwiv+gPhlhWsZuL7C 7Oba0HOOdbVPn4Rf/dnS7PkYpeQpS+u4hfK3OaiIB5Jso6kCGWY/ytWQRerRJw00UjIzo8bOxt/dZ Ev0neSbfKdpixGBKvmQKODpqnKdDvlgZJhh3f+9/339J7yQaZ3iHVZakgXkYs51tAetYTyBZD8aar f0+XAgWg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fUw84-0000li-1O; Mon, 18 Jun 2018 15:31:40 +0000 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fUw7e-0000WF-0K for linux-arm-kernel@lists.infradead.org; Mon, 18 Jun 2018 15:31:15 +0000 Received: by mail-pg0-x241.google.com with SMTP id w12-v6so7694715pgc.6 for ; Mon, 18 Jun 2018 08:31:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6A8fkfXOsrkJKGDJsVXJMIPQ4b9bIzhklMnm5cWFJKw=; b=YDWTXcgQpAE6p25FafOE1pyCXWw8zbDP3kOytBJOa6gGyTdRlPcY8qrIUrO7OWNTMC nwCDuv8jh5YizKkSmhdPB7b9LcnttxycFcTR/NERebZCQ4iZIX0RLzw+IkrR9ebhqn9C NdvnPwZme7is4I+dNWDmyshMb4iA/CQtpdOCM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6A8fkfXOsrkJKGDJsVXJMIPQ4b9bIzhklMnm5cWFJKw=; b=J/CtoQiCpkAz+GeJmQE2NMBh6DxPXmNsdpwlwPDjnHe4pKvvmMyDAZSOuTvsNotpM0 eNQJaA5+V9w5UwonBiDKFufxC6POzWy3YbobZTO06NQSTfnSDR5k34wcRcTSzF9oliBy sx25HGGwqdYn7vN1doREirV/+asDrzW8e+3FQPQQe4YjpQO3PRIgjrbED2Bn5FHKJVGs mmW75XrphzPsWjZsTEjMKCxnCAVvLSkHF4fBADVlRzPo+yIrbyDjgVmz27l+SoIq1aJJ U/2MRBrZlMg8dIA6vA9h3wB97qGdNx53E50Y6VCMuE826fDJjDCe5LR8MpdztHMQXcKf Qugw== X-Gm-Message-State: APt69E0fm62HcRNshFPQCUVbL8OXRO1q455gref8SLi48zHpkkU0K5bz bz48m+G0UUaoTjJFjjqvifViA7XMERQ= X-Google-Smtp-Source: ADUXVKIIGJ9MUdoPft/FmV/BukqgUxdP0DvHF+YSyQSnN9rQg5Io2+ZvRnLQyCTgJv730VTNyCH4Sw== X-Received: by 2002:a65:6303:: with SMTP id g3-v6mr11673597pgv.424.1529335869615; Mon, 18 Jun 2018 08:31:09 -0700 (PDT) Received: from zsm1.corp.google.com ([2620:0:1000:1610:f9fa:7119:2984:84b5]) by smtp.googlemail.com with ESMTPSA id j10-v6sm32138359pfj.158.2018.06.18.08.31.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jun 2018 08:31:08 -0700 (PDT) From: Zubin Mithra To: linux-arm-kernel@lists.infradead.org, mark.rutland@arm.com, ard.biesheuvel@linaro.org, keescook@google.com, groeck@chromium.org Subject: [RFC v2 4/4] arm: add refcounting for task stacks Date: Mon, 18 Jun 2018 08:30:53 -0700 Message-Id: <20180618153053.186224-5-zsm@chromium.org> X-Mailer: git-send-email 2.18.0.rc1.244.gcf134e6275-goog In-Reply-To: <20180618153053.186224-1-zsm@chromium.org> References: <20180618153053.186224-1-zsm@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180618_083114_059644_F1BCA2AC X-CRM114-Status: GOOD ( 17.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: zsm@chromium.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP When CONFIG_THREAD_INFO_IN_TASK is enabled, thread stacks may be freed before a stack is destroyed. This patch adds in refcounting to ensure freed stacks are not used. If CONFIG_THREAD_INFO_IN_TASK is not used, no refcounting is performed. Signed-off-by: Zubin Mithra --- arch/arm/kernel/process.c | 21 +++++++++++++++------ arch/arm/kernel/stacktrace.c | 7 +++++++ arch/arm/kernel/traps.c | 13 +++++++++++-- 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 225d1c58d2de..588003e25a75 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -297,7 +297,7 @@ EXPORT_SYMBOL(dump_fpu); unsigned long get_wchan(struct task_struct *p) { struct stackframe frame; - unsigned long stack_page; + unsigned long stack_page, ret = 0; int count = 0; if (!p || p == current || p->state == TASK_RUNNING) return 0; @@ -306,16 +306,25 @@ unsigned long get_wchan(struct task_struct *p) frame.sp = thread_saved_sp(p); frame.lr = 0; /* recovered from the stack */ frame.pc = thread_saved_pc(p); - stack_page = (unsigned long)task_stack_page(p); + + stack_page = (unsigned long)try_get_task_stack(p); + if (!stack_page) + return 0; + do { if (frame.sp < stack_page || frame.sp >= stack_page + THREAD_SIZE || unwind_frame(&frame) < 0) - return 0; - if (!in_sched_functions(frame.pc)) - return frame.pc; + goto out; + if (!in_sched_functions(frame.pc)) { + ret = frame.pc; + goto out; + } } while (count ++ < 16); - return 0; + +out: + put_task_stack(p); + return ret; } unsigned long arch_randomize_brk(struct mm_struct *mm) diff --git a/arch/arm/kernel/stacktrace.c b/arch/arm/kernel/stacktrace.c index d519b8e0797f..ff20d5941724 100644 --- a/arch/arm/kernel/stacktrace.c +++ b/arch/arm/kernel/stacktrace.c @@ -1,6 +1,7 @@ #include #include #include +#include #include #include @@ -105,6 +106,9 @@ static noinline void __save_stack_trace(struct task_struct *tsk, struct stack_trace_data data; struct stackframe frame; + if (!try_get_task_stack(tsk)) + return; + data.trace = trace; data.skip = trace->skip; data.no_sched_functions = nosched; @@ -118,6 +122,7 @@ static noinline void __save_stack_trace(struct task_struct *tsk, */ if (trace->nr_entries < trace->max_entries) trace->entries[trace->nr_entries++] = ULONG_MAX; + put_task_stack(tsk); return; #else frame.fp = thread_saved_fp(tsk); @@ -137,6 +142,8 @@ static noinline void __save_stack_trace(struct task_struct *tsk, walk_stackframe(&frame, save_trace, &data); if (trace->nr_entries < trace->max_entries) trace->entries[trace->nr_entries++] = ULONG_MAX; + + put_task_stack(tsk); } void save_stack_trace_regs(struct pt_regs *regs, struct stack_trace *trace) diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index badf02ca3693..ec128854016a 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -217,6 +217,9 @@ static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk) if (!tsk) tsk = current; + if (!try_get_task_stack(tsk)) + return; + if (regs) { fp = frame_pointer(regs); mode = processor_mode(regs); @@ -240,6 +243,8 @@ static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk) if (ok) c_backtrace(fp, mode); + + put_task_stack(tsk); } #endif @@ -285,8 +290,12 @@ static int __die(const char *str, int err, struct pt_regs *regs) TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), end_of_stack(tsk)); if (!user_mode(regs) || in_interrupt()) { - dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp, - THREAD_SIZE + (unsigned long)task_stack_page(tsk)); + unsigned long stack_page = try_get_task_stack(tsk); + if (stack_page) { + dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp, + THREAD_SIZE + stack_page); + put_task_stack(tsk); + } dump_backtrace(regs, tsk); dump_instr(KERN_EMERG, regs); }