[tip:x86/boot] x86/boot/KASLR: Always return a value from process_mem_region

From: tip-bot for Louis Taylor
Date: Wed Mar 06 2019 - 16:58:23 EST


Commit-ID: e4a0bd0308f05c1354d28feec8439e869eae6372
Gitweb: https://git.kernel.org/tip/e4a0bd0308f05c1354d28feec8439e869eae6372
Author: Louis Taylor <louis@xxxxxxxxxx>
AuthorDate: Sat, 2 Mar 2019 18:49:29 +0000
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitDate: Wed, 6 Mar 2019 22:55:30 +0100

x86/boot/KASLR: Always return a value from process_mem_region

When compiling with -Wreturn-type, clang warns:

arch/x86/boot/compressed/kaslr.c:704:1: warning: control may reach end of
non-void function [-Wreturn-type]

This function's return statement should have been placed outside the
ifdeffed region. Move it there.

Fixes: 690eaa532057 ("x86/boot/KASLR: Limit KASLR to extract the kernel in immovable memory only")
Signed-off-by: Louis Taylor <louis@xxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Reviewed-by: Nathan Chancellor <natechancellor@xxxxxxxxx>
Reviewed-by: Nick Desaulniers <ndesaulniers@xxxxxxxxxx>
Cc: bp@xxxxxxxxx
Cc: hpa@xxxxxxxxx
Cc: fanc.fnst@xxxxxxxxxxxxxx
Cc: bhe@xxxxxxxxxx
Cc: kirill.shutemov@xxxxxxxxxxxxxxx
Cc: jflat@xxxxxxxxxxxx
Link: https://lkml.kernel.org/r/20190302184929.28971-1-louis@xxxxxxxxxx
---
arch/x86/boot/compressed/kaslr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c
index fa0332dda9f2..2e53c056ba20 100644
--- a/arch/x86/boot/compressed/kaslr.c
+++ b/arch/x86/boot/compressed/kaslr.c
@@ -697,8 +697,8 @@ static bool process_mem_region(struct mem_vector *region,
return 1;
}
}
- return 0;
#endif
+ return 0;
}

#ifdef CONFIG_EFI