Skip to contentSkip to conversation

x86/boot: Fix cmdline_find_option() prototype visibility

PATCH New Borislav Petkov 2 participants 2 messages Feb 5, 2019 – Feb 6, 2019 2 messages not in the archive x86

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 5c51daf0.83pQEkvDZILqoSYW%[email protected]

A message that is not in the archive (sent off-list or not yet received): [email protected]

Borislav Petkov

author maintainer
#2 lore raw

PATCH 1/1 x86/boot: Fix cmdline_find_option() prototype visibility

Quoted 10 lines · Borislav Petkov
Quoted 9 lines · kbuild test robot

tree/branch: https://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git tip-x86-boot
branch HEAD: 593ab2163e72a9697814dbca7247928a2bbb8b49 x86/boot/KASLR: Limit KASLR to extract the kernel in immovable memory only

Regressions in current branch:

arch/x86/boot/compressed/acpi.c:37:8: warning: implicit declaration of function 'cmdline_find_option' [-Wimplicit-function-declaration]

Error ids grouped by kconfigs:

Quoted 7 lines
Quoted 2 lines

recent_errors
└── x86_64-randconfig-s4-01290430

I got a report this morning about x86_64-randconfig-g1-01290904 which I already fixed.

Which config is that x86_64-randconfig-s4-01290430?

Ok, I was able to trigger it. The below should fix it:

---
From: Borislav Petkov <[email protected]>
Subject: [PATCH] x86/boot: Fix cmdline_find_option() prototype visibility
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ac09c5f43cf6 ("x86/boot: Build the command line parsing code unconditionally")

enabled building the command line parsing code unconditionally but it forgot to remove the respected ifdeffery around the prototypes in the misc.h header, leading to

arch/x86/boot/compressed/acpi.c: In function ‘get_acpi_rsdp’:
arch/x86/boot/compressed/acpi.c:37:8: warning: implicit declaration of function \

	  ‘cmdline_find_option’ [-Wimplicit-function-declaration]
    ret = cmdline_find_option("acpi_rsdp", val, MAX_ADDR_LEN);
          ^~~~~~~~~~~~~~~~~~~

for configs where neither CONFIG_EARLY_PRINTK nor CONFIG_RANDOMIZE_BASE was defined.

Drop the ifdeffery in the header too.

Fixes ac09c5f43cf6 ("x86/boot: Build the command line parsing code unconditionally")
Cc Chao Fan <[email protected]>
---
 arch/x86/boot/compressed/misc.h | 2 --
 1 file changed, 2 deletions(-)
arch/x86/boot/compressed/misc.h +0 -2
index 19e8231a6fd6..5b8d51996cdd 100644
@@ -66,11 +66,9 @@ static inline void debug_puthex(const char *s)
 
 #endif
 
-#if CONFIG_EARLY_PRINTK || CONFIG_RANDOMIZE_BASE
 /* cmdline.c */
 int cmdline_find_option(const char *option, char *buffer, int bufsize);
 int cmdline_find_option_bool(const char *option);
-#endif
 
 struct mem_vector {
 	unsigned long long start;
Signature · 7 lines
2.19.1

-- 
Regards/Gruss,
    Boris.

Good mailing practices for 400: avoid top-posting and trim the reply.
#3 lore raw
x86/boot: Fix cmdline_find_option() prototype visibility
Commit-ID:  82f9ed3a93307089242ff8a5c694e82c8c93f522
Gitweb:     https://git.kernel.org/tip/82f9ed3a93307089242ff8a5c694e82c8c93f522
Author:     Borislav Petkov <[email protected]>
AuthorDate: Tue, 5 Feb 2019 12:05:45 +0100
Committer:  Borislav Petkov <[email protected]>
CommitDate: Wed, 6 Feb 2019 11:41:21 +0100

x86/boot: Fix cmdline_find_option() prototype visibility

ac09c5f43cf6 ("x86/boot: Build the command line parsing code unconditionally")

enabled building the command line parsing code unconditionally but it forgot to remove the respective ifdeffery around the prototypes in the misc.h header, leading to

arch/x86/boot/compressed/acpi.c: In function ‘get_acpi_rsdp’:
arch/x86/boot/compressed/acpi.c:37:8: warning: implicit declaration of function \

	  ‘cmdline_find_option’ [-Wimplicit-function-declaration]
    ret = cmdline_find_option("acpi_rsdp", val, MAX_ADDR_LEN);
          ^~~~~~~~~~~~~~~~~~~

for configs where neither CONFIG_EARLY_PRINTK nor CONFIG_RANDOMIZE_BASE was defined.

Drop the ifdeffery in the header too.

---
 arch/x86/boot/compressed/misc.h | 2 --
 1 file changed, 2 deletions(-)
arch/x86/boot/compressed/misc.h +0 -2
index 19e8231a6fd6..5b8d51996cdd 100644
@@ -66,11 +66,9 @@ static inline void debug_puthex(const char *s)
 
 #endif
 
-#if CONFIG_EARLY_PRINTK || CONFIG_RANDOMIZE_BASE
 /* cmdline.c */
 int cmdline_find_option(const char *option, char *buffer, int bufsize);
 int cmdline_find_option_bool(const char *option);
-#endif
 
 struct mem_vector {
 	unsigned long long start;