Unverified Commit 83c20d4b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7402 scsi: lpfc: Fix possible file string name overflow when updating firmware 

Merge Pull Request from: @ci-robot 
 
PR sync from: Baogen Shang <baogen.shang@outlook.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/SN2OCT65YLCRGSG5KKIFX27PB6CMZ622/ 
 
https://gitee.com/openeuler/kernel/issues/I9J6AL 
 
Link:https://gitee.com/openeuler/kernel/pulls/7402

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 7a0905fd 94aa9d99

drivers/scsi/lpfc/lpfc.h

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
struct lpfc_sli2_slim;



#define ELX_MODEL_NAME_SIZE	80

#define ELX_FW_NAME_SIZE	84



#define LPFC_PCI_DEV_LP		0x1

#define LPFC_PCI_DEV_OC		0x2

drivers/scsi/lpfc/lpfc_init.c

+2 −2
Original line number Diff line number Diff line
@@ -13026,7 +13026,7 @@ lpfc_write_firmware(const struct firmware *fw, void *context) 
int

lpfc_sli4_request_firmware_update(struct lpfc_hba *phba, uint8_t fw_upgrade)

{

	uint8_t file_name[ELX_MODEL_NAME_SIZE];

	char file_name[ELX_FW_NAME_SIZE] = {0};

	int ret;

	const struct firmware *fw;
@@ -13035,7 +13035,7 @@ lpfc_sli4_request_firmware_update(struct lpfc_hba *phba, uint8_t fw_upgrade) 
	    LPFC_SLI_INTF_IF_TYPE_2)

		return -EPERM;



	snprintf(file_name, ELX_MODEL_NAME_SIZE, "%s.grp", phba->ModelName);

	scnprintf(file_name, sizeof(file_name), "%s.grp", phba->ModelName);



	if (fw_upgrade == INT_FW_UPGRADE) {

		ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG,