All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] x86/boot/KASLR: Fix unused variable warning
@ 2020-01-10  9:43 Zhenzhong Duan
  2020-01-10  9:48 ` [PATCH v3] " Zhenzhong Duan
  2020-01-10  9:52 ` [PATCH] " Borislav Petkov
  0 siblings, 2 replies; 5+ messages in thread
From: Zhenzhong Duan @ 2020-01-10  9:43 UTC (permalink / raw)
  To: linux-kernel
  Cc: x86, Zhenzhong Duan, Thomas Gleixner, Ingo Molnar,
	Borislav Petkov, H. Peter Anvin, Dave Hansen, Rafael J. Wysocki

Local variable 'i' is referenced only when CONFIG_MEMORY_HOTREMOVE and
CONFIG_ACPI are defined, but definition of variable 'i' is out of guard.
If any of the two macros is undefined, below warning triggers during
build with 'make EXTRA_CFLAGS=-Wall binrpm-pkg', fix it by moving 'i'
in the guard.

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

Fixes: 690eaa532057 ("x86/boot/KASLR: Limit KASLR to extract the kernel in immovable memory only")
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
---
v3: remove changes from 0/1 to false/true per Tglx
    add the command details about triggering build warning per Boris

v2: update description per Boris.

 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 d7408af55738..62bc46684581 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.
@@ -711,6 +710,7 @@ static bool process_mem_region(struct mem_vector *region,
 	}
 
 #if defined(CONFIG_MEMORY_HOTREMOVE) && defined(CONFIG_ACPI)
+	int i;
 	/*
 	 * If immovable memory found, filter the intersection between
 	 * immovable memory and @region.
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH] x86/boot/KASLR: Fix unused variable warning
@ 2019-12-11 13:04 Zhenzhong Duan
  2019-12-14 12:58 ` Borislav Petkov
  0 siblings, 1 reply; 5+ messages in thread
From: Zhenzhong Duan @ 2019-12-11 13:04 UTC (permalink / raw)
  To: linux-kernel
  Cc: tglx, mingo, bp, x86, fanc.fnst, ardb, dave.hansen, dan.j.williams

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 <zhenzhong.duan@oracle.com>
---
 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

^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-01-10  9:52 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-10  9:43 [PATCH] x86/boot/KASLR: Fix unused variable warning Zhenzhong Duan
2020-01-10  9:48 ` [PATCH v3] " Zhenzhong Duan
2020-01-10  9:52 ` [PATCH] " Borislav Petkov
  -- strict thread matches above, loose matches on Subject: below --
2019-12-11 13:04 Zhenzhong Duan
2019-12-14 12:58 ` Borislav Petkov

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.