* [PATCH 4.14] arm64: fix the flush_icache_range arguments in machine_kexec
@ 2020-05-21 14:41 Catalin Marinas
2020-05-22 0:06 ` Sasha Levin
0 siblings, 1 reply; 2+ messages in thread
From: Catalin Marinas @ 2020-05-21 14:41 UTC (permalink / raw)
To: stable; +Cc: Christoph Hellwig
From: Christoph Hellwig <hch@lst.de>
Commit d51c214541c5154dda3037289ee895ea3ded5ebd upstream.
The second argument is the end "pointer", not the length.
Fixes: d28f6df1305a ("arm64/kexec: Add core kexec support")
Cc: <stable@vger.kernel.org> # 4.8.x-
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
---
arch/arm64/kernel/machine_kexec.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c
index 11121f608eb5..f7e593965c1d 100644
--- a/arch/arm64/kernel/machine_kexec.c
+++ b/arch/arm64/kernel/machine_kexec.c
@@ -184,7 +184,8 @@ void machine_kexec(struct kimage *kimage)
/* Flush the reboot_code_buffer in preparation for its execution. */
__flush_dcache_area(reboot_code_buffer, arm64_relocate_new_kernel_size);
flush_icache_range((uintptr_t)reboot_code_buffer,
- arm64_relocate_new_kernel_size);
+ (uintptr_t)reboot_code_buffer +
+ arm64_relocate_new_kernel_size);
/* Flush the kimage list and its buffers. */
kexec_list_flush(kimage);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 4.14] arm64: fix the flush_icache_range arguments in machine_kexec
2020-05-21 14:41 [PATCH 4.14] arm64: fix the flush_icache_range arguments in machine_kexec Catalin Marinas
@ 2020-05-22 0:06 ` Sasha Levin
0 siblings, 0 replies; 2+ messages in thread
From: Sasha Levin @ 2020-05-22 0:06 UTC (permalink / raw)
To: Catalin Marinas; +Cc: stable, Christoph Hellwig
On Thu, May 21, 2020 at 03:41:35PM +0100, Catalin Marinas wrote:
>From: Christoph Hellwig <hch@lst.de>
>
>Commit d51c214541c5154dda3037289ee895ea3ded5ebd upstream.
>
>The second argument is the end "pointer", not the length.
>
>Fixes: d28f6df1305a ("arm64/kexec: Add core kexec support")
>Cc: <stable@vger.kernel.org> # 4.8.x-
>Signed-off-by: Christoph Hellwig <hch@lst.de>
>Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Queued your 4.14 and 4.9 backport, thank you!
--
Thanks,
Sasha
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-22 0:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-21 14:41 [PATCH 4.14] arm64: fix the flush_icache_range arguments in machine_kexec Catalin Marinas
2020-05-22 0:06 ` Sasha Levin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox