From 22a33c7e4ed6aae8c47de72461162021dad87473 Mon Sep 17 00:00:00 2001 From: Vasily Gorbik Date: Fri, 16 Aug 2019 10:43:55 +0200 Subject: s390/startup: round down "mem" option to page boundary Make a usable value out of "mem" option once and for all. Kasan memory allocator just takes memory_end or online memory size as allocation base. If memory_end is not aligned paging structures allocated in kasan end up unaligned as well. So this change fixes potential kasan crash as well. Fixes: 78333d1f908a ("s390/kasan: add support for mem= kernel parameter") Signed-off-by: Vasily Gorbik --- arch/s390/boot/ipl_parm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/s390/boot/ipl_parm.c') diff --git a/arch/s390/boot/ipl_parm.c b/arch/s390/boot/ipl_parm.c index 449d26a42f3f..4a052a844f9b 100644 --- a/arch/s390/boot/ipl_parm.c +++ b/arch/s390/boot/ipl_parm.c @@ -224,7 +224,7 @@ void parse_boot_command_line(void) args = next_arg(args, ¶m, &val); if (!strcmp(param, "mem")) { - memory_end = memparse(val, NULL); + memory_end = round_down(memparse(val, NULL), PAGE_SIZE); memory_end_set = 1; } -- cgit v1.2.3