2019-12-11 13:05:54

by Zhenzhong Duan

Subject: [PATCH] x86/boot/KASLR: Fix unused variable warning

This patch fixes below warning by moving variable 'i':
arch/x86/boot/compressed/kaslr.c:698:6: warning: unused variable ‘i’
[-Wunused-variable]

Also use true/false instead of 1/0 for boolean return.

Fixes: 690eaa532057 ("x86/boot/KASLR: Limit KASLR to extract the
kernel in immovable memory only")
Signed-off-by: Zhenzhong Duan <[email protected]>
---
arch/x86/boot/compressed/kaslr.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c
index d7408af55738..fff24a55bfd5 100644
--- a/arch/x86/boot/compressed/kaslr.c
+++ b/arch/x86/boot/compressed/kaslr.c
@@ -695,7 +695,6 @@ static bool process_mem_region(struct mem_vector *region,
unsigned long long minimum,
unsigned long long image_size)
{
- int i;
/*
* If no immovable memory found, or MEMORY_HOTREMOVE disabled,
* use @region directly.
@@ -705,12 +704,13 @@ static bool process_mem_region(struct mem_vector *region,

if (slot_area_index == MAX_SLOT_AREA) {
debug_putstr("Aborted e820/efi memmap scan (slot_areas full)!\n");
- return 1;
+ return true;
}
- return 0;
+ return false;
}

#if defined(CONFIG_MEMORY_HOTREMOVE) && defined(CONFIG_ACPI)
+ int i;
/*
* If immovable memory found, filter the intersection between
* immovable memory and @region.
@@ -734,11 +734,11 @@ static bool process_mem_region(struct mem_vector *region,

if (slot_area_index == MAX_SLOT_AREA) {
debug_putstr("Aborted e820/efi memmap scan when walking immovable
regions(slot_areas full)!\n");
- return 1;
+ return true;
}
}
#endif
- return 0;
+ return false;
}

#ifdef CONFIG_EFI
--
2.23.0

2019-12-14 13:04:49

by Borislav Petkov

Subject: Re: [PATCH] x86/boot/KASLR: Fix unused variable warning

On Wed, Dec 11, 2019 at 09:04:17PM +0800, Zhenzhong Duan wrote:
> This patch fixes below warning by moving variable 'i':

Avoid having "This patch" or "This commit" in the commit message. It is
tautologically useless.

Also, do

$ git grep 'This patch' Documentation/process

for more details.

> arch/x86/boot/compressed/kaslr.c:698:6: warning: unused variable ‘i’
> [-Wunused-variable]

You could explain here why the warning fires...

> Also use true/false instead of 1/0 for boolean return.
>
> Fixes: 690eaa532057 ("x86/boot/KASLR: Limit KASLR to extract the
> kernel in immovable memory only")
> Signed-off-by: Zhenzhong Duan <[email protected]>
> ---
> arch/x86/boot/compressed/kaslr.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)


WARNING: please, no spaces at the start of a line
#45: FILE: arch/x86/boot/compressed/kaslr.c:707:
+ return true;$

WARNING: please, no spaces at the start of a line
#48: FILE: arch/x86/boot/compressed/kaslr.c:709:
+ return false;$

WARNING: please, no spaces at the start of a line
#52: FILE: arch/x86/boot/compressed/kaslr.c:713:
+ int i;$

ERROR: patch seems to be corrupt (line wrapped?)
#60: FILE: arch/x86/boot/compressed/kaslr.c:736:
regions(slot_areas full)!\n");

WARNING: please, no spaces at the start of a line
#62: FILE: arch/x86/boot/compressed/kaslr.c:737:
+ return true;$

WARNING: please, no spaces at the start of a line
#67: FILE: arch/x86/boot/compressed/kaslr.c:741:
+ return false;$


$ test-apply.sh /tmp/zhenzhong.duan.01
checking file arch/x86/boot/compressed/kaslr.c
patch: **** malformed patch at line 60: regions(slot_areas full)!\n");

I'd be very interested to know how you even managed to create such a
well, hm, "patch"?!

For the future, before you send a patch:

- use checkpatch on it
- send it to yourself and try applying it first

Thx.

--
Regards/Gruss,
Boris.

SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg