From: Tiezhu Yang <yangtiezhu@loongson.cn>
Date: Tue, 24 May 2022 02:27:49 +0000 (+0800)
Subject: MIPS: Return -EINVAL if mem parameter is empty in early_parse_mem()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fb3d6967d508a59b2e8df8358aad1c35579a2833;p=linux.git

MIPS: Return -EINVAL if mem parameter is empty in early_parse_mem()

In the current code, the users usually need to make sure the value
of mem parameter is correct, but it is better to do some check to
avoid potential boot hangs.

This commit checks whether mem parameter is empty, if yes, return
-EINVAL before call memblock_remove() and memblock_add().

Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
---

diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index ad3aea81d0e2a..1c7f91622d91a 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -344,6 +344,11 @@ static int __init early_parse_mem(char *p)
 {
 	phys_addr_t start, size;
 
+	if (!p) {
+		pr_err("mem parameter is empty, do nothing\n");
+		return -EINVAL;
+	}
+
 	/*
 	 * If a user specifies memory size, we
 	 * blow away any automatically generated