summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVasily Gorbik <gor@linux.ibm.com>2019-08-19 04:44:54 -0400
committerVasily Gorbik <gor@linux.ibm.com>2019-08-26 06:51:17 -0400
commita45425d8a5a672d3322164cfce10b7b6fb32fcc2 (patch)
tree4ae2dd8b3efe44027a543c4921af6d6a9b54a127
parent915ef7bda76466a5542a76694c08709895383f1c (diff)
s390/vmcp: correct early_param handling
Check "p" is not NULL before passing it to memparse, which doesn't handle that case explicitly. Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
-rw-r--r--drivers/s390/char/vmcp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/s390/char/vmcp.c b/drivers/s390/char/vmcp.c
index 0fa1b6b1491a..9e066281e2d0 100644
--- a/drivers/s390/char/vmcp.c
+++ b/drivers/s390/char/vmcp.c
@@ -43,6 +43,8 @@ static struct cma *vmcp_cma;
43 43
44static int __init early_parse_vmcp_cma(char *p) 44static int __init early_parse_vmcp_cma(char *p)
45{ 45{
46 if (!p)
47 return 1;
46 vmcp_cma_size = ALIGN(memparse(p, NULL), PAGE_SIZE); 48 vmcp_cma_size = ALIGN(memparse(p, NULL), PAGE_SIZE);
47 return 0; 49 return 0;
48} 50}