Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6f0ec36 authored by Emese Revfy's avatar Emese Revfy Committed by Martin K. Petersen
Browse files

scsi: esas2r: Fix format string type mistakes 



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: default avatarEmese Revfy <re.emese@gmail.com>
[kees: split scsi/acpi, merged attr and fix, new commit messages]
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent eab5c150

drivers/scsi/esas2r/esas2r_init.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -237,7 +237,7 @@ static void esas2r_claim_interrupts(struct esas2r_adapter *a) 
		flags |= IRQF_SHARED;

		flags |= IRQF_SHARED;





	esas2r_log(ESAS2R_LOG_INFO,

	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);

		   a->pcid->irq, a, a->name, flags);





	if (request_irq(a->pcid->irq,

	if (request_irq(a->pcid->irq,

drivers/scsi/esas2r/esas2r_ioctl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1301,7 +1301,7 @@ int esas2r_ioctl_handler(void *hostdata, int cmd, void __user *arg) 
	ioctl = kzalloc(sizeof(struct atto_express_ioctl), GFP_KERNEL);

	ioctl = kzalloc(sizeof(struct atto_express_ioctl), GFP_KERNEL);

	if (ioctl == NULL) {

	if (ioctl == NULL) {

		esas2r_log(ESAS2R_LOG_WARN,

		esas2r_log(ESAS2R_LOG_WARN,

			   "ioctl_handler kzalloc failed for %d bytes",

			   "ioctl_handler kzalloc failed for %zu bytes",

			   sizeof(struct atto_express_ioctl));

			   sizeof(struct atto_express_ioctl));

		return -ENOMEM;

		return -ENOMEM;

	}

	}

drivers/scsi/esas2r/esas2r_log.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -61,8 +61,8 @@ enum { 
#endif

#endif

};

};





int esas2r_log(const long level, const char *format, ...);

__printf(2, 3) int esas2r_log(const long level, const char *format, ...);

int esas2r_log_dev(const long level,

__printf(3, 4) int esas2r_log_dev(const long level,

		   const struct device *dev,

		   const struct device *dev,

		   const char *format,

		   const char *format,

		   ...);

		   ...);

drivers/scsi/esas2r/esas2r_main.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -198,7 +198,7 @@ static ssize_t write_hw(struct file *file, struct kobject *kobj, 
					      GFP_KERNEL);

					      GFP_KERNEL);

		if (a->local_atto_ioctl == NULL) {

		if (a->local_atto_ioctl == NULL) {

			esas2r_log(ESAS2R_LOG_WARN,

			esas2r_log(ESAS2R_LOG_WARN,

				   "write_hw kzalloc failed for %d bytes",

				   "write_hw kzalloc failed for %zu bytes",

				   sizeof(struct atto_ioctl));

				   sizeof(struct atto_ioctl));

			return -ENOMEM;

			return -ENOMEM;

		}

		}
@@ -1186,7 +1186,7 @@ static int esas2r_dev_targ_reset(struct scsi_cmnd *cmd, bool target_reset) 
		} else {

		} else {

			esas2r_log(ESAS2R_LOG_CRIT,

			esas2r_log(ESAS2R_LOG_CRIT,

				   "unable to allocate a request for a "

				   "unable to allocate a request for a "

				   "device reset (%d:%d)!",

				   "device reset (%d:%llu)!",

				   cmd->device->id,

				   cmd->device->id,

				   cmd->device->lun);

				   cmd->device->lun);

		}

		}