Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] I8K: fix /proc reporting of blank service tags

Make /proc/i8k display '?' when service tag is blank in BIOS.
This fixes segfault in i8k gkrellm plugin.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Dmitry Torokhov and committed by
Linus Torvalds
4f005551 44e6f84e

+4 -2
+4 -2
drivers/char/i8k.c
··· 99 99 100 100 static inline char *i8k_get_dmi_data(int field) 101 101 { 102 - return dmi_get_system_info(field) ? : "N/A"; 102 + char *dmi_data = dmi_get_system_info(field); 103 + 104 + return dmi_data && *dmi_data ? dmi_data : "?"; 103 105 } 104 106 105 107 /* ··· 398 396 return seq_printf(seq, "%s %s %s %d %d %d %d %d %d %d\n", 399 397 I8K_PROC_FMT, 400 398 bios_version, 401 - dmi_get_system_info(DMI_PRODUCT_SERIAL) ? : "N/A", 399 + i8k_get_dmi_data(DMI_PRODUCT_SERIAL), 402 400 cpu_temp, 403 401 left_fan, right_fan, left_speed, right_speed, 404 402 ac_power, fn_key);