From patchwork Mon Apr 15 18:59:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 162252 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3297321jan; Mon, 15 Apr 2019 12:09:01 -0700 (PDT) X-Google-Smtp-Source: APXvYqwgGr+3r4jDIA0C1UYrUPzY8Hm3svaeHs90CuTE10Y+n5kuxhL7ZuoiMYINqlmoVSBnalhQ X-Received: by 2002:a17:902:599c:: with SMTP id p28mr14935102pli.70.1555355341831; Mon, 15 Apr 2019 12:09:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555355341; cv=none; d=google.com; s=arc-20160816; b=mqzzhQv44eKDp8rs32AD78bZisUZ5LgaQTyuW9Es9dE7OeWtPJ34chXZqFoD5KUIiI 0gh7ul8YVVSFVvShl53e/QiNMroQgHDp3XgcCUzO5sJV6fLBbK/Hwrjn2MvARhdPYnXm r+l01pM/1m2rfyjr6kreHetvk5nDzbNbrilva4j4CeaxvJj86eXcWsmqgEZ/hhb2mD/9 I5vUO19u9JgrUxys7kCZSX6nNR8D1zWqBv4MSzZUz70EO23/8Ca7FI6HeBzzhsvK/Hve 7WeoAPZiAXNGcmdNUNVIFseBzW+xErLDBnAObxCZKCjLgoX302DjyHrIbCBiQrnNT8Xy mOIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=QYs/qkuYulgB6nUIfNRCQL6gpta9pxUZQC1tubPtIp8=; b=WHfzuMX82nvSp7FUinn9mnxjBQPW2drzDXDK1FWL0xhMjO+wSgVHy2v7/rKhm1t4Qh sA/Cer/9KaVMJd7cVLdPpV20sDeQrUIyQxJd51vlshKWm5a7nFGgPytoe1vxX8+KvBCA 5bQRw9ARM6tEYwnap+kmUSBTsW2rgxnyaoYJXY2RLtulFNMkB3RbtGSye3pIkWtEg1K0 C4KM3HbRKtOez8o6L8dpHajQHSmLlGOgQeFrITLhpn1UUjcyzma9okZFERtSYDIANtO/ f1hAGmP9TESX0XJN0j6G6s44fOeskOMUZ3Ds1rFjU89tGHTRVXX9v5HnT9VlkPNRPMuP N6Ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=oU9sUTlr; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l70si45682616pgd.242.2019.04.15.12.09.01; Mon, 15 Apr 2019 12:09:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=oU9sUTlr; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730625AbfDOTJA (ORCPT + 30 others); Mon, 15 Apr 2019 15:09:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:44532 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730598AbfDOTI6 (ORCPT ); Mon, 15 Apr 2019 15:08:58 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E83E92087C; Mon, 15 Apr 2019 19:08:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555355337; bh=qY7SeKY+Huge9Eq1hAK9oCstFZApOcYzOHXgmCs2CKo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oU9sUTlrCbp8k2hZXMPZOSiRGeYFZRAu36bTndfRH4l1Ed2hn4NMfjnetCKCsxhcY a7ZjN8cye1xWx029xryZfxl9dFiGXPgL2eX1bVidspclZ5FLJhftB7pp6vZMYAidOe 3RjfvHE4rXlp2gkP83fTPDRoHzkojeMlAUkfsSRg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kefeng Wang , Will Deacon Subject: [PATCH 4.19 082/101] arm64: backtrace: Dont bother trying to unwind the userspace stack Date: Mon, 15 Apr 2019 20:59:20 +0200 Message-Id: <20190415183744.750934705@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190415183740.341577907@linuxfoundation.org> References: <20190415183740.341577907@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Will Deacon commit 1e6f5440a6814d28c32d347f338bfef68bc3e69d upstream. Calling dump_backtrace() with a pt_regs argument corresponding to userspace doesn't make any sense and our unwinder will simply print "Call trace:" before unwinding the stack looking for user frames. Rather than go through this song and dance, just return early if we're passed a user register state. Cc: Fixes: 1149aad10b1e ("arm64: Add dump_backtrace() in show_regs") Reported-by: Kefeng Wang Signed-off-by: Will Deacon Signed-off-by: Greg Kroah-Hartman --- arch/arm64/kernel/traps.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -101,10 +101,16 @@ static void dump_instr(const char *lvl, void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk) { struct stackframe frame; - int skip; + int skip = 0; pr_debug("%s(regs = %p tsk = %p)\n", __func__, regs, tsk); + if (regs) { + if (user_mode(regs)) + return; + skip = 1; + } + if (!tsk) tsk = current; @@ -125,7 +131,6 @@ void dump_backtrace(struct pt_regs *regs frame.graph = tsk->curr_ret_stack; #endif - skip = !!regs; printk("Call trace:\n"); do { /* skip until specified stack frame */ @@ -175,15 +180,13 @@ static int __die(const char *str, int er return ret; print_modules(); - __show_regs(regs); pr_emerg("Process %.*s (pid: %d, stack limit = 0x%p)\n", TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), end_of_stack(tsk)); + show_regs(regs); - if (!user_mode(regs)) { - dump_backtrace(regs, tsk); + if (!user_mode(regs)) dump_instr(KERN_EMERG, regs); - } return ret; }