Skip to contentSkip to conversation

kallsyms: fix building without printk

PATCH In review Arnd Bergmann 2 participants 3 messages Nov 13, 2017 – Nov 14, 2017 Printk

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 kallsyms: fix building without printk

Building kallsyms fails without CONFIG_PRINTK due to a missing declaration:

kernel/kallsyms.c: In function 'kallsyms_show_value':
kernel/kallsyms.c:670:10: error: 'kptr_restrict' undeclared (first use in this function); did you mean 'keyring_restrict'?

This moves the declaration outside of the #ifdef guard, the definition is already available without CONFIG_PRINTK.

Fixes c0f3ea158939 ("stop using '%pK' for /proc/kallsyms pointer values")
---
 include/linux/printk.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
include/linux/printk.h +2 -1
index fbb75cac9028..e9b603ee9953 100644
@@ -187,7 +187,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
 
 extern int printk_delay_msec;
 extern int dmesg_restrict;
-extern int kptr_restrict;
 
 extern int
 devkmsg_sysctl_set_loglvl(struct ctl_table *table, int write, void __user *buf,
@@ -278,6 +277,8 @@ static inline void printk_safe_flush_on_panic(void)
 }
 #endif
 
+extern int kptr_restrict;
+
 extern asmlinkage void dump_stack(void) __cold;
 
 #ifndef pr_fmt
Signature · 1 line
2.9.0
#1 lore raw

PATCH 2/2 /proc/module: fix building without kallsyms

As reported by kernelci and other build bots, we now get a link failure without CONFIG_KALLSYMS:

module.c:(.text+0xf2c): undefined reference to `kallsyms_show_value'

This adds a dummy helper with the same name that can be used for compilation. It's not entirely clear to me what this should return for !CONFIG_KALLSYMS, I picked an unconditional 'false', which leads to the module address being unavailable to user space.

Fixes 516fb7f2e73d ("/proc/module: use the same logic as /proc/kallsyms for address exposure")
---
 include/linux/kallsyms.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
include/linux/kallsyms.h +8 -2
index 0a777c5216b1..708f337d780b 100644
@@ -14,8 +14,6 @@
 #define KSYM_SYMBOL_LEN (sizeof("%s+%#lx/%#lx [%s]") + (KSYM_NAME_LEN - 1) + \
 			 2*(BITS_PER_LONG*3/10) + (MODULE_NAME_LEN - 1) + 1)
 
-/* How and when do we show kallsyms values? */
-extern int kallsyms_show_value(void);
 #ifndef CONFIG_64BIT
 # define KALLSYM_FMT "%08lx"
 #else
@@ -54,6 +52,9 @@ extern void __print_symbol(const char *fmt, unsigned long address);
 int lookup_symbol_name(unsigned long addr, char *symname);
 int lookup_symbol_attrs(unsigned long addr, unsigned long *size, unsigned long *offset, char *modname, char *name);
 
+/* How and when do we show kallsyms values? */
+extern int kallsyms_show_value(void);
+
 #else /* !CONFIG_KALLSYMS */
 
 static inline unsigned long kallsyms_lookup_name(const char *name)
@@ -112,6 +113,11 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
 	return -ERANGE;
 }
 
+static inline int kallsyms_show_value(void)
+{
+	return false;
+}
+
 /* Stupid that this does nothing, but I didn't create this mess. */
 #define __print_symbol(fmt, addr)
 #endif /*CONFIG_KALLSYMS*/
Signature · 1 line
2.9.0
Reviewed-by on v1 1/2
#2 lore raw
In reply to Arnd Bergmann
Quoted 11 lines · Arnd Bergmann

Building kallsyms fails without CONFIG_PRINTK due to a missing declaration:

kernel/kallsyms.c: In function 'kallsyms_show_value':
kernel/kallsyms.c:670:10: error: 'kptr_restrict' undeclared (first use in this function); did you mean 'keyring_restrict'?

This moves the declaration outside of the #ifdef guard, the definition is already available without CONFIG_PRINTK.

Fixes c0f3ea158939 ("stop using '%pK' for /proc/kallsyms pointer values")

ah, I see what happened. was confused at first, because we do !PRINTK build tests.

FWIW,

thanks.

	-ss
Quoted 28 lines
---
 include/linux/printk.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
include/linux/printk.h +2 -1
index fbb75cac9028..e9b603ee9953 100644
@@ -187,7 +187,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
 
 extern int printk_delay_msec;
 extern int dmesg_restrict;
-extern int kptr_restrict;
 
 extern int
 devkmsg_sysctl_set_loglvl(struct ctl_table *table, int write, void __user *buf,
@@ -278,6 +277,8 @@ static inline void printk_safe_flush_on_panic(void)
 }
 #endif
 
+extern int kptr_restrict;
+
 extern asmlinkage void dump_stack(void) __cold;
 
 #ifndef pr_fmt
Signature · 1 line
2.9.0