From patchwork Wed Jan 30 01:20:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kpark3469@gmail.com X-Patchwork-Id: 2064501 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 7D346DF23E for ; Wed, 30 Jan 2013 01:25:23 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U0MNp-00036n-Ih; Wed, 30 Jan 2013 01:22:37 +0000 Received: from mail-ee0-f46.google.com ([74.125.83.46]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U0MNl-00036V-IV for linux-arm-kernel@lists.infradead.org; Wed, 30 Jan 2013 01:22:34 +0000 Received: by mail-ee0-f46.google.com with SMTP id e49so558090eek.33 for ; Tue, 29 Jan 2013 17:22:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=I8EjV5RPqoquiAA4U2tOj7UWYosC/OWxbTjW+yFqJ0A=; b=nyxbYWRbDrBeWkK/ChxI0O8KfTfZtTyUPVmn0aeZrcdxKWR3o36334xkgmYqLnIsuX ZemQJ7uIZ/82JmkFBAhNfspytrpuHDy6Rvj1osR1jViC8FVJcDxRjco5tSdXckpie1xj Bz7SMrdcPZwcZfczRFBh6NEaJLxcUAL6ygR7VWrsRsKNAyHD4LwqHNgtwAfmI3kGEgqn 4Lz18bAyOjK13NR6ZAG6zWRtS43v/h59eKj3TGUqFoZsWL/iSuTuSi0K1zZApkqY8yMQ Lfwg/xe21piAxMhvmxKtkHOPbtP9goHoyt2KY+E4jOCUp/Om4H6JRfPBFe7xUK+6uw4C c9Jg== X-Received: by 10.14.4.194 with SMTP id 42mr9244101eej.35.1359508951502; Tue, 29 Jan 2013 17:22:31 -0800 (PST) Received: from localhost.localdomain ([61.107.31.52]) by mx.google.com with ESMTPS id 6sm22248353eea.3.2013.01.29.17.22.25 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 29 Jan 2013 17:22:30 -0800 (PST) From: kpark3469@gmail.com To: linux@arm.linux.org.uk Subject: [PATCH v2] arm: fix returning wrong CALLER_ADDRx Date: Wed, 30 Jan 2013 10:20:49 +0900 Message-Id: <1359508849-2831-1-git-send-email-kpark3469@gmail.com> X-Mailer: git-send-email 1.7.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130129_202233_729513_02CF376C X-CRM114-Status: GOOD ( 12.06 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (kpark3469[at]gmail.com) -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.83.46 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (kpark3469[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: keun-o.park@windriver.com, dave.martin@linaro.org, fweisbec@gmail.com, linux-kernel@vger.kernel.org, rostedt@goodmis.org, mingo@redhat.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: sahara This makes return_address return correct value for ftrace feature. unwind_frame does not update frame->lr but frame->pc for backtrace. And, the initialization for data.addr was missing so that wrong value returned when unwind_frame failed. Signed-off-by: Sahara Reviewed-by: Dave Martin --- arch/arm/kernel/return_address.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c index 8085417..fafedd8 100644 --- a/arch/arm/kernel/return_address.c +++ b/arch/arm/kernel/return_address.c @@ -26,7 +26,7 @@ static int save_return_addr(struct stackframe *frame, void *d) struct return_address_data *data = d; if (!data->level) { - data->addr = (void *)frame->lr; + data->addr = (void *)frame->pc; return 1; } else { @@ -41,7 +41,8 @@ void *return_address(unsigned int level) struct stackframe frame; register unsigned long current_sp asm ("sp"); - data.level = level + 1; + data.level = level + 2; + data.addr = NULL; frame.fp = (unsigned long)__builtin_frame_address(0); frame.sp = current_sp;