Commit 21b81716 authored Feb 25, 2016 by Gabriel Krisman Bertazi Committed by Martin K. Petersen Feb 26, 2016

ipr: Fix regression when loading firmware



Commit d63c7dd5 ("ipr: Fix out-of-bounds null overwrite") removed
the end of line handling when storing the update_fw sysfs attribute.
This changed the userpace API because it started refusing writes
terminated by a line feed, which broke the update tools we already have.

This patch re-adds that handling, so both a write terminated by a line
feed or not can make it through with the update.

Fixes: d63c7dd5 ("ipr: Fix out-of-bounds null overwrite")
Signed-off-by: Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
Cc: Insu Yun <wuninsu@gmail.com>
Acked-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent e1cd3911

drivers/scsi/ipr.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -4002,6 +4002,7 @@ static ssize_t ipr_store_update_fw(struct device *dev,
		struct ipr_sglist *sglist;
		char fname[100];
		char *src;
		char *endline;
		int result, dnld_size;

		if (!capable(CAP_SYS_ADMIN))
		@@ -4009,6 +4010,10 @@ static ssize_t ipr_store_update_fw(struct device *dev,

		snprintf(fname, sizeof(fname), "%s", buf);

		endline = strchr(fname, '\n');
		if (endline)
		*endline = '\0';

		if (request_firmware(&fw_entry, fname, &ioa_cfg->pdev->dev)) {
		dev_err(&ioa_cfg->pdev->dev, "Firmware file %s not found\n", fname);
		return -EIO;

Admin message