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 610F9364C5; Tue, 16 Jan 2024 20:00:56 +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=1705435256; cv=none; b=Bf6UjLnjTAF9PQM/F3JeNrIUr4B3ps9f0aP7KNONap6APjtk/UOfaeBvZQonRLAdZA7ATPnYyDi45zoL7EHf1SuKY59btXi8LJ96pO9fwF9bSUUntxyESFdLmji6tof4W7Ci1Bqvkg3UG0xQQqz1U+o+GrvncSciDMTgDq0Ec/g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705435256; c=relaxed/simple; bh=ZnpY8MesuXMPzUC7kw77KTU0WsQBmgX23zrmyyVhIaM=; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID: X-Mailer:In-Reply-To:References:MIME-Version:X-stable: X-Patchwork-Hint:X-stable-base:Content-Transfer-Encoding; b=kkcy66kY9Lhk37Eg3qMLQM7rDboay8qOxGdlOvUNX5rzlwKxEbjmsla9JmgCL5Qfi04syMRjxAhQwI/snwVcg54ial6AFIO9KxBcDuw4stZ3dYfP6gLIXD7/Uw/8ivSfXmSCLrzZa8WFKJ8D8zdlxQ0ZDPAy5dkDylxIdrOTZjM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WblUlr85; 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="WblUlr85" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2EFBFC433C7; Tue, 16 Jan 2024 20:00:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705435256; bh=ZnpY8MesuXMPzUC7kw77KTU0WsQBmgX23zrmyyVhIaM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WblUlr851+I6Rmz2Zd4OkmTIuqhVZphft6RdTcL6KAeP3EVZg43JJx+6iSj7j9yQJ kXPMyQiFwrJd+3HVXip8j8tQHKR1DVs7p3soozoqW86Lme21ymEm2yQuzqX9GpfvU9 oCStSkQkGtDbb+PInmACBA+texX3TUkJi6OsCSJ2V8fZ/KR9PALohgqWLr5aND0J4m lLWko4okuP92CxA+x5I6Zd70CAmpmp8dRXAyo8abaNx5Mhhb2zrk+Skx1dSPqdTsE+ 9ow2ZS9Jb8e+Ag0QR4HIDVD6FuXXceaNsGLbCXEM3zclbDoAjTEDat18LyByOvq4dE +8JLzSsLcEiPA== 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 5.10 04/44] scsi: lpfc: Fix possible file string name overflow when updating firmware Date: Tue, 16 Jan 2024 14:59:33 -0500 Message-ID: <20240116200044.258335-4-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240116200044.258335-1-sashal@kernel.org> References: <20240116200044.258335-1-sashal@kernel.org> 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 5.10.208 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 03bc472f302a..cf69f831a725 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 1bb3c96a04bd..5f2009327a59 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c @@ -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, -- 2.43.0