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.6 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 6AB1BC282CC for ; Thu, 7 Feb 2019 20:33:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 36BB2205C9 for ; Thu, 7 Feb 2019 20:33:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="drJTSP+l" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726651AbfBGUdu (ORCPT ); Thu, 7 Feb 2019 15:33:50 -0500 Received: from mail-lj1-f193.google.com ([209.85.208.193]:36992 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726614AbfBGUdu (ORCPT ); Thu, 7 Feb 2019 15:33:50 -0500 Received: by mail-lj1-f193.google.com with SMTP id r10-v6so1073626ljj.4 for ; Thu, 07 Feb 2019 12:33:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=/FWlYdHt4AQPZjIxTxrH0YN5a92cqY3h/dn59sFC3AI=; b=drJTSP+lltibq3XObu7IpdORK2s68rx7xpZ9mbMZ0d+kn/+oxWFXq/6sNnPLX5f8M2 kDSDT03+p1tX4BQ2kmTyC8pBc9I+biourgBwbNRRwI0K5TkLPVXCanWt/8GiTHWTgFuO qRujFd2tLE4l+5/w+M+tBjHDUsBmcwJK21En1Q37cLlN7iU+rFJMnRcZTAFO076qlmHd WulsZJHX0HD6WPaPSlY76sNZCBWOfFWb4o4k2a1/Wfg8YUMzcY9JYkoU0L/kbWR5ikgF QHv5fluRwlpV265gPbcwMsZoun3f2QsHmRiG2qXHlhUaBg4GT7S88j/+bu+sSpA041E3 fFXg== 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=/FWlYdHt4AQPZjIxTxrH0YN5a92cqY3h/dn59sFC3AI=; b=M7sQgk1Dr5W4B6hm7RsMNv9gn7SzCgyF9QpPcqKF44NwurtUWKC01HH8hFVIhvezKE JwRGui5ZpWQPrY+1JxMejiOgMK6kw2lYbc9WwQmIVP/92qscAbQ5Ud+g9UkCg23LtqTr xlmMm4Nxly5J2WTxyfHr4FxfirRwsilwFz3wLDINpy28nljBlv98JFlgMFBwsZ2Mcb5r WQt0FWKrqJAmMSeKPQxTWQxkAQn2BZtIMuGb9JVuMbiQ7IuHa5InDrZXb7SwY/I0e32S KT8OvWGpUIMGbX8/qtdigfxsBwsQUMJ8IqcaqQTd2mfz3brGJWHi7hczePV/Vu3gY69D B6CQ== X-Gm-Message-State: AHQUAubAdzT9Zm+mJAz/8bvq5Kq/6fuSXTFXhypFJZLjBLDsX7oyZ9Ja ZF8R4r/LEARC0+Di4+6809A= X-Google-Smtp-Source: AHgI3IaaBG/exHAihZLh39AjTycaIXhTH+AvTwQYBNhrj/ErSnb33cHsbdgSAX6hX8mUdVyOKiQEfg== X-Received: by 2002:a2e:5854:: with SMTP id x20-v6mr11086905ljd.31.1549571628172; Thu, 07 Feb 2019 12:33:48 -0800 (PST) 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 x24-v6sm4793077ljc.54.2019.02.07.12.33.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 12:33:47 -0800 (PST) From: Max Filippov To: linux-xtensa@linux-xtensa.org Cc: Chris Zankel , Max Filippov , stable@vger.kernel.org Subject: [PATCH] xtensa: fix get_wchan Date: Thu, 7 Feb 2019 12:33:36 -0800 Message-Id: <20190207203336.5627-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 Stack unwinding is implemented incorrectly in xtensa get_wchan: instead of extracting a0 and a1 registers from the spill location under the stack pointer it extracts a word pointed to by the stack pointer and subtracts 4 or 3 from it. Cc: stable@vger.kernel.org Signed-off-by: Max Filippov --- arch/xtensa/kernel/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/xtensa/kernel/process.c b/arch/xtensa/kernel/process.c index 74969a437a37..2e73395f0560 100644 --- a/arch/xtensa/kernel/process.c +++ b/arch/xtensa/kernel/process.c @@ -321,8 +321,8 @@ unsigned long get_wchan(struct task_struct *p) /* Stack layout: sp-4: ra, sp-3: sp' */ - pc = MAKE_PC_FROM_RA(*(unsigned long*)sp - 4, sp); - sp = *(unsigned long *)sp - 3; + pc = MAKE_PC_FROM_RA(SPILL_SLOT(sp, 0), sp); + sp = SPILL_SLOT(sp, 1); } while (count++ < 16); return 0; } -- 2.11.0