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 C3518219F9; Tue, 16 Jan 2024 19:43:15 +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=1705434195; cv=none; b=QaStffrVDhhXjwxWXsmLLbUmCvcB6K/bP8x3luGJOUjaRlb9XdCp9RygFxSCmXE0WcjbJ0zIEvlO0kI2qZOI6yE2KPrJzBZBnHse+O3yQhJGvHV3ylki4d74xphgW6yHI/TVTI0SSxM2yO1LEzC6LLJgVmDWevvLZkGHhGK/M1E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705434195; c=relaxed/simple; bh=eR8yEaTqAVpW2rNkevvVi7ySxRNimbWWf1WpSCVzzjc=; 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=kP15mgXmaYdUajY6rdeQC4mwD2P8iCom9m9KcMLkPO6VzdCOg/q0FIFxqd3G6iNnHzOggWQjBaJY6nICL+2H8exE8FqgrrJO4Ok4cqlScxUYuaIBmv2IRb8X1mqSRnGK/ptKMjwitdIJZ90GjbLPUg9s0c0r5AkKihgHMdqKRhE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bjL0iZDM; 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="bjL0iZDM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E01EC43390; Tue, 16 Jan 2024 19:43:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705434195; bh=eR8yEaTqAVpW2rNkevvVi7ySxRNimbWWf1WpSCVzzjc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bjL0iZDMXMQFwUrfWPBWYZdtkBnGqy1arsm7bapXwRQ/LzvFQe26d6gnD9gkPaC/A lY725HyML5CQUgZEhuSlh+heFlZBQi9L/xd8Rpf2t0bd3gqlFahE789PR15W159Ugr f1xtbmqqxrEyWD16s13K9b5k+f7QIAyYxzNT1smNy/hijpXOvTnfPhFjpPCrnpt529 1NePUbdwj/IWowONYmErdK01wUwDL5Pf8VAEpkHZDwNg56ZgtcAUb8N0QKBl/y6ZBH I51MHBNSRCD0OP14sHexOgmoEggZHUz1SmVcg6mSalGWyd1ZU/l/z8Pf6pnX8MXFYd 8gjBofcX07EJQ== 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 6.7 016/108] scsi: lpfc: Fix possible file string name overflow when updating firmware Date: Tue, 16 Jan 2024 14:38:42 -0500 Message-ID: <20240116194225.250921-16-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240116194225.250921-1-sashal@kernel.org> References: <20240116194225.250921-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.7 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 af15f7a22d25..04d608ea9106 100644 --- a/drivers/scsi/lpfc/lpfc.h +++ b/drivers/scsi/lpfc/lpfc.h @@ -33,6 +33,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 e7c47ee185a4..70bcee64bc8c 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c @@ -14721,7 +14721,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; @@ -14730,7 +14730,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_UEVENT, -- 2.43.0