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 88397221FC7; Mon, 23 Jun 2025 21:36:55 +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=1750714615; cv=none; b=a+JMhuKM1+KWvSJWuQb0RnWNi9y3THLIkmXIMFEs/8bGj2Pv6OejPQAGCoG4nPO9GXKYuG0qvhId0QaYAKO1qBWMiBRcHBR+yeBfD40bEzcVsO+rkwO6jbolW2T4Gdoe7H2Bi9M+xzXjIqsFecOmekXOZVyxwSSoOZhj6kvi6rI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750714615; c=relaxed/simple; bh=oE8jDLd5un7DkKjKI6MqaFDfMdS4q64UvA4VRQNqK6U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jjgGNyC08vL1c14yGsSnqdwX4qW6i8unqJd3dUK6tmPVdOsnXMbsd6DSAR8tGGFmdXy3UmDZn9ZT3skNDRtdw561KbIAzVhclk0URmDb4cbkKhJF069EUOOYRvJ2GkL9UXrgj4XZgUlUBSPSVWEDiklGlnmxY/d2cB3HoxL8sDY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=So7FtDrL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="So7FtDrL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1FE66C4CEED; Mon, 23 Jun 2025 21:36:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750714615; bh=oE8jDLd5un7DkKjKI6MqaFDfMdS4q64UvA4VRQNqK6U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=So7FtDrLPCb5XjqswTh4DariJ8+b5MeZaRhSr6HMKdzG5tyhAUrvrc/4ex9FEqMXp S9Pl9Qd7DkIfi+4izOIOHBNW9+EvaxEC/GwxbquFozjmrpExP2824U6y13R/bpBAjF nfrlZ64N+WxAVSbGhlqxtLd4vmcf/TffneCFjiz8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Daniel Wagner , Justin Tee , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 6.15 405/592] scsi: lpfc: Use memcpy() for BIOS version Date: Mon, 23 Jun 2025 15:06:03 +0200 Message-ID: <20250623130710.072178012@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130700.210182694@linuxfoundation.org> References: <20250623130700.210182694@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Daniel Wagner [ Upstream commit ae82eaf4aeea060bb736c3e20c0568b67c701d7d ] The strlcat() with FORTIFY support is triggering a panic because it thinks the target buffer will overflow although the correct target buffer size is passed in. Anyway, instead of memset() with 0 followed by a strlcat(), just use memcpy() and ensure that the resulting buffer is NULL terminated. BIOSVersion is only used for the lpfc_printf_log() which expects a properly terminated string. Signed-off-by: Daniel Wagner Link: https://lore.kernel.org/r/20250409-fix-lpfc-bios-str-v1-1-05dac9e51e13@kernel.org Reviewed-by: Justin Tee Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/lpfc/lpfc_sli.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index 6574f9e744766..a335d34070d3c 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c @@ -6003,9 +6003,9 @@ lpfc_sli4_get_ctl_attr(struct lpfc_hba *phba) phba->sli4_hba.flash_id = bf_get(lpfc_cntl_attr_flash_id, cntl_attr); phba->sli4_hba.asic_rev = bf_get(lpfc_cntl_attr_asic_rev, cntl_attr); - memset(phba->BIOSVersion, 0, sizeof(phba->BIOSVersion)); - strlcat(phba->BIOSVersion, (char *)cntl_attr->bios_ver_str, + memcpy(phba->BIOSVersion, cntl_attr->bios_ver_str, sizeof(phba->BIOSVersion)); + phba->BIOSVersion[sizeof(phba->BIOSVersion) - 1] = '\0'; lpfc_printf_log(phba, KERN_INFO, LOG_SLI, "3086 lnk_type:%d, lnk_numb:%d, bios_ver:%s, " -- 2.39.5