On 02/25/2016 10:54 AM, Gabriel Krisman Bertazi wrote:
> Commit d63c7dd5bcb9 ("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: d63c7dd5bcb9 ("ipr: Fix out-of-bounds null overwrite")
> Signed-off-by: Gabriel Krisman Bertazi <krisman@xxxxxxxxxxxxxxxxxx>
> Cc: Insu Yun <wuninsu@xxxxxxxxx>
> ---
> drivers/scsi/ipr.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
> index 3b3e099..d6a691e 100644
> --- a/drivers/scsi/ipr.c
> +++ b/drivers/scsi/ipr.c
> @@ -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;
>
Acked-by: Brian King <brking@xxxxxxxxxxxxxxxxxx>
James - since this is a regression, can we get this fix in for 4.5 yet?
Thanks,
Brian
--
Brian King
Power Linux I/O
IBM Linux Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
