From: dave.martin@linaro.org (Dave Martin)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] arm: fix returning wrong CALLER_ADDRx
Date: Tue, 29 Jan 2013 13:01:12 +0000 [thread overview]
Message-ID: <20130129130039.GA3817@linaro.org> (raw)
In-Reply-To: <1357888690-24012-1-git-send-email-kpark3469@gmail.com>
On Fri, Jan 11, 2013 at 04:18:10PM +0900, Keun-O Park wrote:
> From: sahara <keun-o.park@windriver.com>
>
> 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 <keun-o.park@windriver.com>
Reviewed-by: Dave Martin <dave.martin@linaro.org>
This is the same as a patch I previously posted:
http://lists.infradead.org/pipermail/linux-arm-kernel/2012-November/129381.html
...except for the initialisation of data.addr to NULL, which is needed
in order to prevent a garbage pointer being returned in the case where
the unwinder fails to unwind a frame before the required level
is reached.
Cheers
---Dave
> ---
> 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;
> --
> 1.7.1
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
prev parent reply other threads:[~2013-01-29 13:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-11 7:18 [PATCH] arm: fix returning wrong CALLER_ADDRx Keun-O Park
2013-01-29 13:01 ` Dave Martin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130129130039.GA3817@linaro.org \
--to=dave.martin@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).