scsi: ultrastor: Use correct format identifier for kernel pointer
PATCH RESEND 1/1 scsi: ultrastor: Use correct format identifier for kernel pointer
The 'bios_segment' member of a struct ultrastor_config is passed to the sprintf function with a respective %05X format identifier. The 'bio_segment' member is a kernel pointer, but the %X format identifier expects an int data type. A cast to int is correctly used to satisfy the format identifier, but this assumes that the int data type is the same size as the kernel pointer, which is not the case on several architectures such as X86_64. This patch removes the int cast and replaces the %05X format identifier with %pK in order to print the 'bio_segment' member regardless of architecture.
--- drivers/scsi/ultrastor.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/scsi/ultrastor.c +4 -4
@@ -670,12 +670,12 @@ static const char *ultrastor_info(struct Scsi_Host * shpnt)sprintf (buf,"UltraStor 24F SCSI @ Slot %u IRQ%u" , config.slot, config.interrupt); else if (config.subversion) - sprintf(buf, "UltraStor 34F SCSI @ Port %03X BIOS %05X IRQ%u", - config.port_address, (int )config.bios_segment, + sprintf(buf, "UltraStor 34F SCSI @ Port %03X BIOS %pK IRQ%u", + config.port_address, config.bios_segment, config.interrupt); else - sprintf(buf, "UltraStor 14F SCSI @ Port %03X BIOS %05X IRQ%u DMA%u", - config.port_address, (int )config.bios_segment, + sprintf(buf, "UltraStor 14F SCSI @ Port %03X BIOS %pK IRQ%u DMA%u", + config.port_address, config.bios_segment, config.interrupt, config.dma_channel);return buf; }
Signature · 1 line
2.7.3
Quoted 9 lines · William Breathitt Gray
The '
bios_segment' member of a structultrastor_configis passed to the sprintf function with a respective %05X format identifier. The 'bio_segment' member is a kernel pointer, but the %X format identifier expects an int data type. A cast to int is correctly used to satisfy the format identifier, but this assumes that the int data type is the same size as the kernel pointer, which is not the case on several architectures such asX86_64. This patch removes the int cast and replaces the %05X format identifier with %pK in order to print the 'bio_segment' member regardless of architecture.
But this statement is wrong: ultrastor only has seven possible hard coded bios segment values, all under 20 bits, as it happens, that's why the printk is %05X. Unless you're proposing to alter values in the static table, there's no point in changing the print, is there? Are you proposing to alter the static table values?
James
Quoted 11 lines · James Bottomley
Quoted 9 lines · William Breathitt Gray
The '
bios_segment' member of a structultrastor_configis passed to the sprintf function with a respective %05X format identifier. The 'bio_segment' member is a kernel pointer, but the %X format identifier expects an int data type. A cast to int is correctly used to satisfy the format identifier, but this assumes that the int data type is the same size as the kernel pointer, which is not the case on several architectures such asX86_64. This patch removes the int cast and replaces the %05X format identifier with %pK in order to print the 'bio_segment' member regardless of architecture.
Quoted 7 lines
But this statement is wrong: ultrastor only has seven possible hard coded bios segment values, all under 20 bits, as it happens, that's why the printk is %05X. Unless you're proposing to alter values in the static table, there's no point in changing the print, is there? Are you proposing to alter the static table values?
James
I'm sorry, I didn't realize bios_segment values were all under 20 bits; in which case they should all fit within the original 5 digit hexadecimal print. Please ignore this patch then as it was a misunderstanding on my part.
Thanks,
William Breathitt Gray