Skip to content

Commit bc978cc

Browse files
lag-linaromartinkpetersen
authored andcommitted
scsi: aacraid: aachba: Replace snprintf() with the safer scnprintf() variant
There is a general misunderstanding amongst engineers that {v}snprintf() returns the length of the data *actually* encoded into the destination array. However, as per the C99 standard {v}snprintf() really returns the length of the data that *would have been* written if there were enough space for it. This misunderstanding has led to buffer-overruns in the past. It's generally considered safer to use the {v}scnprintf() variants in their place (or even sprintf() in simple cases). So let's do that. Link: https://lwn.net/Articles/69419/ Link: KSPP#105 Cc: Adaptec OEM Raid Solutions <aacraid@microsemi.com> Cc: PMC-Sierra, Inc <aacraid@pmc-sierra.com> Signed-off-by: Lee Jones <lee@kernel.org> Link: https://lore.kernel.org/r/20240111131732.1815560-6-lee@kernel.org Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent f615c74 commit bc978cc

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/scsi/aacraid/aachba.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1099,7 +1099,7 @@ static void get_container_serial_callback(void *context, struct fib * fibptr)
10991099
sp[0] = INQD_PDT_DA;
11001100
sp[1] = scsicmd->cmnd[2];
11011101
sp[2] = 0;
1102-
sp[3] = snprintf(sp+4, sizeof(sp)-4, "%08X",
1102+
sp[3] = scnprintf(sp+4, sizeof(sp)-4, "%08X",
11031103
le32_to_cpu(get_serial_reply->uid));
11041104
scsi_sg_copy_from_buffer(scsicmd, sp,
11051105
sizeof(sp));
@@ -1169,8 +1169,8 @@ static int setinqserial(struct aac_dev *dev, void *data, int cid)
11691169
/*
11701170
* This breaks array migration.
11711171
*/
1172-
return snprintf((char *)(data), sizeof(struct scsi_inq) - 4, "%08X%02X",
1173-
le32_to_cpu(dev->adapter_info.serial[0]), cid);
1172+
return scnprintf((char *)(data), sizeof(struct scsi_inq) - 4, "%08X%02X",
1173+
le32_to_cpu(dev->adapter_info.serial[0]), cid);
11741174
}
11751175

11761176
static inline void set_sense(struct sense_data *sense_data, u8 sense_key,

0 commit comments

Comments
 (0)