From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 90CB16706C; Tue, 16 Jan 2024 20:04:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705435476; cv=none; b=ARZfzN6U3Na1J9PyNivObx5lnrkxlU8urW2wkDDyqqy0EX5lQpNeExJKJq47YkzXBs1NOdomAsy7egzDP9Dw7PTUDInyZrNZZPe9eyVnFKDCCLu3muUzo9hYUqufI/QNOZMWgFJ/lWT1DhJig5y64/6owhbR1R7R3od16dZIAJw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705435476; c=relaxed/simple; bh=8URfo+JULmWklSLjvW/SRpqud05CMUom6m5j7LEfoZ8=; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID: X-Mailer:MIME-Version:X-stable:X-Patchwork-Hint:X-stable-base: Content-Transfer-Encoding; b=nwARuLcDmhNZErHH/UtjhHpmMFjeEvm932FB/cVxD7ZVScq5N3JSuhcIMSIMB/3BDsfp0N7vX7d+FTqOaFq9BQlYpSujonaEEy/x314mef+AuXylYdE2DWdA0J4EACJifkyP5YQaLro1lzsx+ncMasAyPCNQujFYVRIr7nGyfPk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fBjKuVO7; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="fBjKuVO7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 184B4C433C7; Tue, 16 Jan 2024 20:04:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705435476; bh=8URfo+JULmWklSLjvW/SRpqud05CMUom6m5j7LEfoZ8=; h=From:To:Cc:Subject:Date:From; b=fBjKuVO7jVPIUklTnhZ0CMaWUvEyyU1ssAxfbH+CX3k6r8d/RtiNnKTtjlC9UdL0Z Uw+KjzKke5v2pUTgs/1WWlyiM851BAhaeCHf9uMstzCcucFeU9I62nCn0twSdnv5Vr aPKE2WMTFsgizRQnUs/nRbmahVvWhwA1bwkrK/sw01p6J3AsQqZ0D3vxde3KgsPAfa NXY2JtBdpiO7W4XzK9X8nKIceyVdCeYKpWCUPUEAcOE36BZmm/Ehy4NfNLj/nV2JMd +IqKKisvClny/eH0V6Zb4WiMa3l0HNg+8V6gQJQNjzW5xxl0DHpVE0TynCRId+S/0e mxalMXDVGGO0Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Justin Tee , Himanshu Madhani , "Martin K . Petersen" , Sasha Levin , james.smart@broadcom.com, dick.kennedy@broadcom.com, jejb@linux.ibm.com, linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 01/22] scsi: lpfc: Fix possible file string name overflow when updating firmware Date: Tue, 16 Jan 2024 15:03:55 -0500 Message-ID: <20240116200432.260016-1-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 4.19.305 Content-Transfer-Encoding: 8bit From: Justin Tee [ Upstream commit f5779b529240b715f0e358489ad0ed933bf77c97 ] Because file_name and phba->ModelName are both declared a size 80 bytes, the extra ".grp" file extension could cause an overflow into file_name. Define a ELX_FW_NAME_SIZE macro with value 84. 84 incorporates the 4 extra characters from ".grp". file_name is changed to be declared as a char and initialized to zeros i.e. null chars. Signed-off-by: Justin Tee Link: https://lore.kernel.org/r/20231031191224.150862-3-justintee8345@gmail.com Reviewed-by: Himanshu Madhani Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/lpfc/lpfc.h | 1 + drivers/scsi/lpfc/lpfc_init.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h index 706aca3f7c25..53b661793268 100644 --- a/drivers/scsi/lpfc/lpfc.h +++ b/drivers/scsi/lpfc/lpfc.h @@ -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 diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index c6caacaa3e7a..7db4e893e10e 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c @@ -11428,7 +11428,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; @@ -11437,7 +11437,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, -- 2.43.0