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

Configure Feed

Select the types of activity you want to include in your feed.

scsi: hpsa: Enlarge controller and IRQ name buffers

hpsa formats the controller name into h->devname[8] and derives
interrupt names from it in h->intrname[][16]. Once host_no reaches four
digits, "hpsa%d" no longer fits in devname, and the derived IRQ names
can then overrun the interrupt-name buffers as well.

The previous fix switched these builders to bounded formatting, but that
would truncate user-visible controller and IRQ names. Keep the existing
names intact instead by enlarging the fixed buffers to cover the current
formatted strings.

Fixes: 2946e82bdd76 ("hpsa: use scsi host_no as hpsa controller number")
Fixes: 8b47004a5512 ("hpsa: add interrupt number to /proc/interrupts interrupt name")
Acked-by: Don Brace <don.brace@microchip.com>
Signed-off-by: Pengpeng Hou <pengpeng@iscas.ac.cn>
Link: https://patch.msgid.link/20260401120552.78541-1-pengpeng@iscas.ac.cn
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Pengpeng Hou and committed by
Martin K. Petersen 8e8cb6f3 fc0a1d05

+2 -2
+2 -2
drivers/scsi/hpsa.h
··· 164 164 struct ctlr_info { 165 165 unsigned int *reply_map; 166 166 int ctlr; 167 - char devname[8]; 167 + char devname[16]; 168 168 char *product_name; 169 169 struct pci_dev *pdev; 170 170 u32 board_id; ··· 255 255 int remove_in_progress; 256 256 /* Address of h->q[x] is passed to intr handler to know which queue */ 257 257 u8 q[MAX_REPLY_QUEUES]; 258 - char intrname[MAX_REPLY_QUEUES][16]; /* "hpsa0-msix00" names */ 258 + char intrname[MAX_REPLY_QUEUES][32]; /* controller and IRQ names */ 259 259 u32 TMFSupportFlags; /* cache what task mgmt funcs are supported. */ 260 260 #define HPSATMF_BITS_SUPPORTED (1 << 0) 261 261 #define HPSATMF_PHYS_LUN_RESET (1 << 1)