* [PATCH] MIPS: Loongson64: Add WARN_ON on kexec related kmalloc failed
@ 2022-11-03 1:18 Liao Chang
2022-11-11 15:03 ` Thomas Bogendoerfer
0 siblings, 1 reply; 2+ messages in thread
From: Liao Chang @ 2022-11-03 1:18 UTC (permalink / raw)
To: chenhuacai, jiaxun.yang, tsbogend, tangyouling, hejinyang
Cc: linux-mips, linux-kernel, liaochang1
Add WARN_ON on kexec related kmalloc failed, avoid to pass NULL pointer
to following memcpy and loongson_kexec_prepare.
Fixes: 6ce48897ce47 ("MIPS: Loongson64: Add kexec/kdump support")
Signed-off-by: Liao Chang <liaochang1@huawei.com>
---
arch/mips/loongson64/reset.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/arch/mips/loongson64/reset.c b/arch/mips/loongson64/reset.c
index 758d5d26aaaa..e420800043b0 100644
--- a/arch/mips/loongson64/reset.c
+++ b/arch/mips/loongson64/reset.c
@@ -16,6 +16,7 @@
#include <asm/bootinfo.h>
#include <asm/idle.h>
#include <asm/reboot.h>
+#include <asm/bug.h>
#include <loongson.h>
#include <boot_param.h>
@@ -159,8 +160,17 @@ static int __init mips_reboot_setup(void)
#ifdef CONFIG_KEXEC
kexec_argv = kmalloc(KEXEC_ARGV_SIZE, GFP_KERNEL);
+ if (WARN_ON(!kexec_argv))
+ return -ENOMEM;
+
kdump_argv = kmalloc(KEXEC_ARGV_SIZE, GFP_KERNEL);
+ if (WARN_ON(!kdump_argv))
+ return -ENOMEM;
+
kexec_envp = kmalloc(KEXEC_ENVP_SIZE, GFP_KERNEL);
+ if (WARN_ON(!kexec_envp))
+ return -ENOMEM;
+
fw_arg1 = KEXEC_ARGV_ADDR;
memcpy(kexec_envp, (void *)fw_arg2, KEXEC_ENVP_SIZE);
--
2.17.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] MIPS: Loongson64: Add WARN_ON on kexec related kmalloc failed
2022-11-03 1:18 [PATCH] MIPS: Loongson64: Add WARN_ON on kexec related kmalloc failed Liao Chang
@ 2022-11-11 15:03 ` Thomas Bogendoerfer
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Bogendoerfer @ 2022-11-11 15:03 UTC (permalink / raw)
To: Liao Chang
Cc: chenhuacai, jiaxun.yang, tangyouling, hejinyang, linux-mips,
linux-kernel
On Thu, Nov 03, 2022 at 09:18:15AM +0800, Liao Chang wrote:
> Add WARN_ON on kexec related kmalloc failed, avoid to pass NULL pointer
> to following memcpy and loongson_kexec_prepare.
>
> Fixes: 6ce48897ce47 ("MIPS: Loongson64: Add kexec/kdump support")
> Signed-off-by: Liao Chang <liaochang1@huawei.com>
> ---
> arch/mips/loongson64/reset.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/arch/mips/loongson64/reset.c b/arch/mips/loongson64/reset.c
> index 758d5d26aaaa..e420800043b0 100644
> --- a/arch/mips/loongson64/reset.c
> +++ b/arch/mips/loongson64/reset.c
> @@ -16,6 +16,7 @@
> #include <asm/bootinfo.h>
> #include <asm/idle.h>
> #include <asm/reboot.h>
> +#include <asm/bug.h>
>
> #include <loongson.h>
> #include <boot_param.h>
> @@ -159,8 +160,17 @@ static int __init mips_reboot_setup(void)
>
> #ifdef CONFIG_KEXEC
> kexec_argv = kmalloc(KEXEC_ARGV_SIZE, GFP_KERNEL);
> + if (WARN_ON(!kexec_argv))
> + return -ENOMEM;
> +
> kdump_argv = kmalloc(KEXEC_ARGV_SIZE, GFP_KERNEL);
> + if (WARN_ON(!kdump_argv))
> + return -ENOMEM;
> +
> kexec_envp = kmalloc(KEXEC_ENVP_SIZE, GFP_KERNEL);
> + if (WARN_ON(!kexec_envp))
> + return -ENOMEM;
> +
> fw_arg1 = KEXEC_ARGV_ADDR;
> memcpy(kexec_envp, (void *)fw_arg2, KEXEC_ENVP_SIZE);
>
> --
> 2.17.1
applied to mips-fixes.
Thomas.
--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-11-11 15:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-03 1:18 [PATCH] MIPS: Loongson64: Add WARN_ON on kexec related kmalloc failed Liao Chang
2022-11-11 15:03 ` Thomas Bogendoerfer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®