ipr: Fix regression when loading firmware
Commitd63c7dd5bc
("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:d63c7dd5bc
("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>
This commit is contained in:
Родитель
e1cd391117
Коммит
21b81716c6
|
@ -4002,6 +4002,7 @@ static ssize_t ipr_store_update_fw(struct device *dev,
|
||||||
struct ipr_sglist *sglist;
|
struct ipr_sglist *sglist;
|
||||||
char fname[100];
|
char fname[100];
|
||||||
char *src;
|
char *src;
|
||||||
|
char *endline;
|
||||||
int result, dnld_size;
|
int result, dnld_size;
|
||||||
|
|
||||||
if (!capable(CAP_SYS_ADMIN))
|
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);
|
snprintf(fname, sizeof(fname), "%s", buf);
|
||||||
|
|
||||||
|
endline = strchr(fname, '\n');
|
||||||
|
if (endline)
|
||||||
|
*endline = '\0';
|
||||||
|
|
||||||
if (request_firmware(&fw_entry, fname, &ioa_cfg->pdev->dev)) {
|
if (request_firmware(&fw_entry, fname, &ioa_cfg->pdev->dev)) {
|
||||||
dev_err(&ioa_cfg->pdev->dev, "Firmware file %s not found\n", fname);
|
dev_err(&ioa_cfg->pdev->dev, "Firmware file %s not found\n", fname);
|
||||||
return -EIO;
|
return -EIO;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче