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 2F13A1F4168; Tue, 11 Feb 2025 01:31:44 +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=1739237504; cv=none; b=fIDEN5RiK6+jNYkw1YnCyBA35P2qpgZy1zQO9ILppDURasMbBlUfUryFEDdfmuc+cP5LzYKEb1Mb7o2FlLH9ebxhRRKlXzvGYMn/CYzVtbnxpUtQfu/We0URaGdtA7KxdwajBBy9x4fZI5krNpaBRg95url6zTkWj5ITLIGWBAw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739237504; c=relaxed/simple; bh=iiOkryXmhkldJUUdUWPMeYG3VZWIaMZDxkZthCW/oSQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=j66rxNKsjeEtiKscwzydFkrsQ6HE9PZrgRMk7FFFfkinQ2rOufJ+mbsKdV+JtYM0ngPv228nV9KpFCetAp3+sysnQaTh5nzYAXQ216MS6jxNkmAHoRIe8Ob5E6pDzlsI/o0K16N4RPEuzbdV7aRltFSGX+K30+TB8HW9a4yPWZM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MEYPIoGi; 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="MEYPIoGi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 41671C4CED1; Tue, 11 Feb 2025 01:31:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739237504; bh=iiOkryXmhkldJUUdUWPMeYG3VZWIaMZDxkZthCW/oSQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MEYPIoGifmntvVtYpUqgwid652Smx5NU3Zpi1KsDkv458W8MqfcPgfzB4M5IGP9x0 gyjVr4yLmwWcqze4P99I/xUUWp+K/f+QqHQl32Y4UGY/BjcqCjjq2TMTSLPrSpVQwK XBBX4XtK8fvtL+pcv6wcJMNs379Y06Wy9hemT4dYhrnyqXag1MnwfH35THCaHoG6Pr Bq3uJjtceO+5+mcqmYxGoJmbDI1W65zncnL/3NdSIKaoZj4QE3essbI73Das6Ljf4x yPewe9Tl2bfX64BjCDohUodvR6CqkZnwCxiayauQ4frdq/5VWokJfSP2ImdozhBlRo GXmNvlJinPt6Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chengen Du , Konrad Rzeszutek Wilk , Sasha Levin , pjones@redhat.com, konrad@kernel.org Subject: [PATCH AUTOSEL 6.6 05/15] iscsi_ibft: Fix UBSAN shift-out-of-bounds warning in ibft_attr_show_nic() Date: Mon, 10 Feb 2025 20:31:25 -0500 Message-Id: <20250211013136.4098219-5-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250211013136.4098219-1-sashal@kernel.org> References: <20250211013136.4098219-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@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.6.76 Content-Transfer-Encoding: 8bit From: Chengen Du [ Upstream commit 07e0d99a2f701123ad3104c0f1a1e66bce74d6e5 ] When performing an iSCSI boot using IPv6, iscsistart still reads the /sys/firmware/ibft/ethernetX/subnet-mask entry. Since the IPv6 prefix length is 64, this causes the shift exponent to become negative, triggering a UBSAN warning. As the concept of a subnet mask does not apply to IPv6, the value is set to ~0 to suppress the warning message. Signed-off-by: Chengen Du Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Sasha Levin --- drivers/firmware/iscsi_ibft.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c index 6e9788324fea5..371f24569b3b2 100644 --- a/drivers/firmware/iscsi_ibft.c +++ b/drivers/firmware/iscsi_ibft.c @@ -310,7 +310,10 @@ static ssize_t ibft_attr_show_nic(void *data, int type, char *buf) str += sprintf_ipaddr(str, nic->ip_addr); break; case ISCSI_BOOT_ETH_SUBNET_MASK: - val = cpu_to_be32(~((1 << (32-nic->subnet_mask_prefix))-1)); + if (nic->subnet_mask_prefix > 32) + val = cpu_to_be32(~0); + else + val = cpu_to_be32(~((1 << (32-nic->subnet_mask_prefix))-1)); str += sprintf(str, "%pI4", &val); break; case ISCSI_BOOT_ETH_PREFIX_LEN: -- 2.39.5