linux-kernel - [PATCH] x86/boot/KASLR: Fix unused variable warning

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAFH1YnM_2xud4V7sAZAMWPpWP0CBHxuddAKjxHJsj9U9WfH2ww@mail.gmail.com>
Date:   Wed, 11 Dec 2019 21:04:17 +0800
From:   Zhenzhong Duan <zhenzhong.duan@...il.com>
To:     linux-kernel@...r.kernel.org
Cc:     tglx@...utronix.de, mingo@...hat.com, bp@...e.de, x86@...nel.org,
        fanc.fnst@...fujitsu.com, ardb@...nel.org,
        dave.hansen@...ux.intel.com, dan.j.williams@...el.com
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 <zhenzhong.duan@...cle.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