Skip to contentSkip to conversation

scsi: esas2r: Fix format string type mistakes

PATCH Applied Kees Cook 2 participants 2 messages Jan 4, 2017 – Jan 10, 2017

Subsystems (2)
SCSI Atto expresssas SAS/SATA RAID SCSI driver
lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH v2 1/1 scsi: esas2r: Fix format string type mistakes

From: Emese Revfy <[email protected]>

This adds the missing __printf attribute which allows compile time format string checking (and will be used by the coming initify gcc plugin). Additionally, this fixes the warnings exposed by the attribute.

Signed-off-by Emese Revfy <[email protected]>
[kees: split scsi/acpi, merged attr and fix, new commit messages]
Signed-off-by Kees Cook <[email protected]>

---
v2:
- fix %lu to %zu on sizeof() values, bart

---
 drivers/scsi/esas2r/esas2r_init.c  | 2 +-
 drivers/scsi/esas2r/esas2r_ioctl.c | 2 +-
 drivers/scsi/esas2r/esas2r_log.h   | 4 ++--
 drivers/scsi/esas2r/esas2r_main.c  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)
drivers/scsi/esas2r/esas2r_init.c +1 -1
index d6e53aee2295..6432a50b26d8 100644
@@ -237,7 +237,7 @@ static void esas2r_claim_interrupts(struct esas2r_adapter *a)
 		flags |= IRQF_SHARED;
 
 	esas2r_log(ESAS2R_LOG_INFO,
-		   "esas2r_claim_interrupts irq=%d (%p, %s, %x)",
+		   "esas2r_claim_interrupts irq=%d (%p, %s, %lx)",
 		   a->pcid->irq, a, a->name, flags);
 
 	if (request_irq(a->pcid->irq,
drivers/scsi/esas2r/esas2r_ioctl.c +1 -1
index 3e8483410f61..b35ed3829421 100644
@@ -1301,7 +1301,7 @@ int esas2r_ioctl_handler(void *hostdata, int cmd, void __user *arg)
 	ioctl = kzalloc(sizeof(struct atto_express_ioctl), GFP_KERNEL);
 	if (ioctl == NULL) {
 		esas2r_log(ESAS2R_LOG_WARN,
-			   "ioctl_handler kzalloc failed for %d bytes",
+			   "ioctl_handler kzalloc failed for %zu bytes",
 			   sizeof(struct atto_express_ioctl));
 		return -ENOMEM;
 	}
drivers/scsi/esas2r/esas2r_log.h +2 -2
index 7b6397bb5b94..75b9d23cd736 100644
@@ -61,8 +61,8 @@ enum {
 #endif
 };
 
-int esas2r_log(const long level, const char *format, ...);
-int esas2r_log_dev(const long level,
+__printf(2, 3) int esas2r_log(const long level, const char *format, ...);
+__printf(3, 4) int esas2r_log_dev(const long level,
 		   const struct device *dev,
 		   const char *format,
 		   ...);
drivers/scsi/esas2r/esas2r_main.c +2 -2
index 5092c821d088..f2e9d8aa979c 100644
@@ -198,7 +198,7 @@ static ssize_t write_hw(struct file *file, struct kobject *kobj,
 					      GFP_KERNEL);
 		if (a->local_atto_ioctl == NULL) {
 			esas2r_log(ESAS2R_LOG_WARN,
-				   "write_hw kzalloc failed for %d bytes",
+				   "write_hw kzalloc failed for %zu bytes",
 				   sizeof(struct atto_ioctl));
 			return -ENOMEM;
 		}

@@ -1186,7 +1186,7 @@ static int esas2r_dev_targ_reset(struct scsi_cmnd *cmd, bool target_reset)
 		} else {
 			esas2r_log(ESAS2R_LOG_CRIT,
 				   "unable to allocate a request for a "
-				   "device reset (%d:%d)!",
+				   "device reset (%d:%llu)!",
 				   cmd->device->id,
 				   cmd->device->lun);
 		}
Signature · 6 lines
2.7.4


-- 
Kees Cook
Nexus Security
Applied
#1 lore raw
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Kees" == Kees Cook <[email protected]> writes:

Kees> From: Emese Revfy <[email protected]> This adds the missing Kees> __printf attribute which allows compile time format string Kees> checking (and will be used by the coming initify gcc Kees> plugin). Additionally, this fixes the warnings exposed by the Kees> attribute.

Applied to 4.11/scsi-queue.

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering