public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

EISA: Increase length of device names

Browse source 
GCC 15's -Wunterminated-string-initialization warned about truncated
name strings. Instead of marking them with the "nonstring" attribute[1],
increase their length to correctly include enough space for the
terminating NUL character, as they are used with %s format specifiers
when showing resource allocations in /proc/ioports:

        seq_printf(m, "%*s%0*llx-%0*llx : %s\n", ..., r->name);

The strings in eisa.ids have a max length of 73, and the 50 limit was an
arbitrary limit that was removed back in 2008 with commit ca52a49846
("driver core: remove DEVICE_NAME_SIZE define"). Change the limit to 74
so nothing is truncated any more.

Additionally fix the Makefile to use "if_changed" instead of "cmd"
to detect changes to the command line used to generate the target,
otherwise devlist.h won't be rebuilt.

Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117178 [1]
Signed-off-by: Kees Cook <kees@kernel.org>
Acked-by: Alejandro Colomar <alx@kernel.org>
Link: https://lore.kernel.org/r/20250407172926.it.281-kees@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kees Cook 2025-04-07 10:29:35 -07:00 • committed by Greg Kroah-Hartman
parent 577f88cf24
commit dd09eb0e2c
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/eisa/Makefile
View file

@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
# Makefile for the Linux device tree # Makefile for the Linux device tree
obj-$(CONFIG_EISA) += eisa-bus.o obj-$(CONFIG_EISA) += devlist.h eisa-bus.o
obj-${CONFIG_EISA_PCI_EISA} += pci_eisa.o obj-${CONFIG_EISA_PCI_EISA} += pci_eisa.o
# virtual_root.o should be the last EISA root device to initialize, # virtual_root.o should be the last EISA root device to initialize,
@ -9,14 +9,11 @@ obj-${CONFIG_EISA_PCI_EISA} += pci_eisa.o
obj-${CONFIG_EISA_VIRTUAL_ROOT} += virtual_root.o obj-${CONFIG_EISA_VIRTUAL_ROOT} += virtual_root.o
# Ugly hack to get DEVICE_NAME_SIZE value...
DEVICE_NAME_SIZE = 50
$(obj)/eisa-bus.o: $(obj)/devlist.h $(obj)/eisa-bus.o: $(obj)/devlist.h
quiet_cmd_eisaid = GEN $@ quiet_cmd_eisaid = GEN $@
cmd_eisaid = sed -e '/^\#/D' -e 's/^\([[:alnum:]]\{7\}\) \+"\([^"]\{1,$(DEVICE_NAME_SIZE)\}\).*"/EISA_DEVINFO ("\1", "\2"),/' $< > $@ cmd_eisaid = sed -e '/^\#/D' -e 's/^\([[:alnum:]]\{7\}\) \+"\([^"]*\)"/EISA_DEVINFO ("\1", "\2"),/' $< > $@
clean-files := devlist.h clean-files := devlist.h
$(obj)/devlist.h: $(src)/eisa.ids include/linux/device.h $(obj)/devlist.h: $(src)/eisa.ids include/linux/device.h FORCE
$(call cmd,eisaid) $(call if_changed,eisaid)

2
drivers/eisa/eisa-bus.c
View file

@ -21,7 +21,7 @@
struct eisa_device_info { struct eisa_device_info {
struct eisa_device_id id; struct eisa_device_id id;
char name[50]; char name[EISA_DEVICE_INFO_NAME_SIZE];
}; };
#ifdef CONFIG_EISA_NAMES #ifdef CONFIG_EISA_NAMES

5
include/linux/eisa.h
View file

@ -28,6 +28,9 @@
#define EISA_CONFIG_ENABLED 1 #define EISA_CONFIG_ENABLED 1
#define EISA_CONFIG_FORCED 2 #define EISA_CONFIG_FORCED 2
/* Chosen to hold the longest string in eisa.ids. */
#define EISA_DEVICE_INFO_NAME_SIZE 74
/* There is not much we can say about an EISA device, apart from /* There is not much we can say about an EISA device, apart from
* signature, slot number, and base address. dma_mask is set by * signature, slot number, and base address. dma_mask is set by
* default to parent device mask..*/ * default to parent device mask..*/
@ -41,7 +44,7 @@ struct eisa_device {
u64 dma_mask; u64 dma_mask;
struct device dev; /* generic device */ struct device dev; /* generic device */
#ifdef CONFIG_EISA_NAMES #ifdef CONFIG_EISA_NAMES
char pretty_name[50]; char pretty_name[EISA_DEVICE_INFO_NAME_SIZE];
#endif #endif
}; };