Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,FROM_LOCAL_NOVOWEL, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 191D7C4360F for ; Thu, 4 Apr 2019 18:19:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E1B6D206B7 for ; Thu, 4 Apr 2019 18:19:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="D74OX5W7" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728762AbfDDSTn (ORCPT ); Thu, 4 Apr 2019 14:19:43 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:46692 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727310AbfDDSTn (ORCPT ); Thu, 4 Apr 2019 14:19:43 -0400 Received: by mail-lj1-f193.google.com with SMTP id h21so2920550ljk.13 for ; Thu, 04 Apr 2019 11:19:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=NQ3MA72e39EpdoUQ6LSAkneF5xstVRITDjuYnErDnMM=; b=D74OX5W7tPNNVHEM8OEWXyJ7ZN3M1zLbogXnnn7UmHewQ3kd+be1qxqaDnxPftY5ef bp7e8xyGph4aJJ09AXCXgRIU8Jqit4c3wKwFDz/xo1umD/i6mvG9A70ineW+esuS1+IO 83clL7Sh1JHz8hj7fo5arDfUKpPBaRZxDu64vIkljhFeNnOhT8ZbCl1oo0KTfKXTLAZF sl4nrT4G5/yaWyw29QS3ed1fqCY3iyXQSDtj7Ee3B5tddUZ+q8VDJ1GX3o8XnpRzrGrJ UhuA8f35zm5cw7m2X9+aQNbTJrvR2eMrAP9iz+lDSXsAP4mzPRQY23fopMllfRlN2GY3 ooiQ== 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; bh=NQ3MA72e39EpdoUQ6LSAkneF5xstVRITDjuYnErDnMM=; b=Nx0NHox5eSaDjFT7brqWViqN/QU4A5UTqUhKc/sWbQfouL4CZUpSpuLwqf8J4vRrMH ki4duGZeuooan4gzUzCEstJChSwdwHG1yUp8/H/NxvKUSTKKe2G42Njs2o5Tm+k+MGjk AguHF/FUHwSOv54X7ojLxKQfEHiwFKlo7wtCVEVwDEvjPRpg8lMbwcDCvl3oqkrfiShf JJUnXdCMOI2O/jd2LKsBi/DS3TiiTsz3h9Y2z7YCPW1np1P8aixGV/ZGbyBZA+uFHry+ vtjWqZrCqqoU91S8uhxNmk66yidp6x+tz6MZWoBBM9c3G9KCulQ8TNISUnQRKiIw2y3G 7mLA== X-Gm-Message-State: APjAAAXVCMuwkXZ3D4nqPEL8mBdtLKNGopH7e1EG5sYnC7fjZu5rfanB 7qafC5Tg8sJNEEnpFlhBWBc= X-Google-Smtp-Source: APXvYqw8i92FAai4GjXIN/8CTAqIItU56vCuveBvFIrTRSpGRTxq+WyAyQFdMFk8xHKRK/0M6AFXUQ== X-Received: by 2002:a05:651c:d0:: with SMTP id 16mr4280451ljr.150.1554401981652; Thu, 04 Apr 2019 11:19:41 -0700 (PDT) Received: from octofox.cadence.com (jcmvbkbc-1-pt.tunnel.tserv24.sto1.ipv6.he.net. [2001:470:27:1fa::2]) by smtp.gmail.com with ESMTPSA id v4sm1149412ljh.40.2019.04.04.11.19.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Apr 2019 11:19:41 -0700 (PDT) From: Max Filippov To: linux-xtensa@linux-xtensa.org Cc: Chris Zankel , Max Filippov , stable@vger.kernel.org Subject: [PATCH] xtensa: fix return_address Date: Thu, 4 Apr 2019 11:19:31 -0700 Message-Id: <20190404181931.24727-1-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.11.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org return_address returns the address that is one level higher in the call stack than requested in its argument, because level 0 corresponds to its caller's return address. Use requested level as the number of stack frames to skip. This fixes the address reported by might_sleep and friends. Cc: stable@vger.kernel.org Signed-off-by: Max Filippov --- arch/xtensa/kernel/stacktrace.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/xtensa/kernel/stacktrace.c b/arch/xtensa/kernel/stacktrace.c index 174c11f13bba..b9f82510c650 100644 --- a/arch/xtensa/kernel/stacktrace.c +++ b/arch/xtensa/kernel/stacktrace.c @@ -253,10 +253,14 @@ static int return_address_cb(struct stackframe *frame, void *data) return 1; } +/* + * level == 0 is for the return address from the caller of this function, + * not from this function itself. + */ unsigned long return_address(unsigned level) { struct return_addr_data r = { - .skip = level + 1, + .skip = level, }; walk_stackframe(stack_pointer(NULL), return_address_cb, &r); return r.addr; -- 2.11.0