From: Palmer Dabbelt <palmer@dabbelt.com>
To: jszhang3@mail.ustc.edu.cn
Cc: ryabinin.a.a@gmail.com, glider@google.com, andreyknvl@gmail.com,
dvyukov@google.com, Paul Walmsley <paul.walmsley@sifive.com>,
aou@eecs.berkeley.edu, alex@ghiti.fr,
kasan-dev@googlegroups.com, linux-riscv@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] riscv: kasan: Fix MODULES_VADDR evaluation due to local variables' name
Date: Fri, 18 Jun 2021 23:58:43 -0700 (PDT) [thread overview]
Message-ID: <mhng-b491e8d5-d7dc-4f5e-8b96-84d47360d85d@palmerdabbelt-glaptop> (raw)
In-Reply-To: <20210618220136.21f32b98@xhacker>
On Fri, 18 Jun 2021 07:01:36 PDT (-0700), jszhang3@mail.ustc.edu.cn wrote:
> From: Jisheng Zhang <jszhang@kernel.org>
>
> commit 2bfc6cd81bd1 ("riscv: Move kernel mapping outside of linear
> mapping") makes use of MODULES_VADDR to populate kernel, BPF, modules
> mapping. Currently, MODULES_VADDR is defined as below for RV64:
>
> | #define MODULES_VADDR (PFN_ALIGN((unsigned long)&_end) - SZ_2G)
>
> But kasan_init() has two local variables which are also named as _start,
> _end, so MODULES_VADDR is evaluated with the local variable _end
> rather than the global "_end" as we expected. Fix this issue by
> renaming the two local variables.
>
> Fixes: 2bfc6cd81bd1 ("riscv: Move kernel mapping outside of linear mapping")
> Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
> ---
> arch/riscv/mm/kasan_init.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/riscv/mm/kasan_init.c b/arch/riscv/mm/kasan_init.c
> index 55c113345460..d7189c8714a9 100644
> --- a/arch/riscv/mm/kasan_init.c
> +++ b/arch/riscv/mm/kasan_init.c
> @@ -169,7 +169,7 @@ static void __init kasan_shallow_populate(void *start, void *end)
>
> void __init kasan_init(void)
> {
> - phys_addr_t _start, _end;
> + phys_addr_t p_start, p_end;
> u64 i;
>
> /*
> @@ -189,9 +189,9 @@ void __init kasan_init(void)
> (void *)kasan_mem_to_shadow((void *)VMALLOC_END));
>
> /* Populate the linear mapping */
> - for_each_mem_range(i, &_start, &_end) {
> - void *start = (void *)__va(_start);
> - void *end = (void *)__va(_end);
> + for_each_mem_range(i, &p_start, &p_end) {
> + void *start = (void *)__va(p_start);
> + void *end = (void *)__va(p_end);
>
> if (start >= end)
> break;
Thanks for this. I'd prefer a cleaner fix for tihs (maybe more '_'s in
_end?), but I don't think we can do that without touching a bunch of
code. Given that this is necessary to make the fix work for me, I'm
just going to take it as-is.
This is on fixes.
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
prev parent reply other threads:[~2021-06-19 6:59 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-18 14:01 [PATCH] riscv: kasan: Fix MODULES_VADDR evaluation due to local variables' name Jisheng Zhang
2021-06-19 6:58 ` Palmer Dabbelt [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=mhng-b491e8d5-d7dc-4f5e-8b96-84d47360d85d@palmerdabbelt-glaptop \
--to=palmer@dabbelt.com \
--cc=alex@ghiti.fr \
--cc=andreyknvl@gmail.com \
--cc=aou@eecs.berkeley.edu \
--cc=dvyukov@google.com \
--cc=glider@google.com \
--cc=jszhang3@mail.ustc.edu.cn \
--cc=kasan-dev@googlegroups.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=paul.walmsley@sifive.com \
--cc=ryabinin.a.a@gmail.com \
/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).