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 B3B2A20E8DE; Wed, 25 Sep 2024 12:09:12 +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=1727266152; cv=none; b=j+bgA7PoGuEXkUmarHpw5tlOVk+/SQTKGnN1F8IT1HZop8+IiLgLZATtYUurSSAAhURb9a45NUq30ZuAT9dr/knrRF6Ud54es55N6BdjhqwtwxO3sIk0cR62oNAaUL6Km9ip1l8aubMbOIBOdxTmivWDjC0UxF2+f8EBzxRuoVo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727266152; c=relaxed/simple; bh=5ipd+6i1vmYzbqSVixtByEgWCPbCf8XMcpZSqw510BY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=J5UXzF43OBliVhgewFQw2hSv/YfpUFYmeZ4LP3wl8KmAe2y7a9Q6Xa+F66YCbP3PaW3h9fmpV7mPpewDnXG3UGkW7dvPmS715hH4xg8bORhrMN4Bvlp1vd4y1TBKpSfCC2FNeDcOs6JWNES642NRirWF6qMT9iXhbgyTlAGewhE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nlhkUrpM; 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="nlhkUrpM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 70F5BC4CEC7; Wed, 25 Sep 2024 12:09:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727266152; bh=5ipd+6i1vmYzbqSVixtByEgWCPbCf8XMcpZSqw510BY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nlhkUrpMF0X/kpC/VxaBpaSjzcxvA5MnC+9f4d2zf2HwDMlKO02bKZEAxl1jNjbLt 39OjxcC7yNGjmGCIam3hgBPb4J5PKU+PdIHDB1iuzVGbTau3wrYTc5tvWrnt06UpgV 9GIabbDepyS86PAp3plTkMw5eWLBn1opIVJ269Jbp3spalYfpmzMKVHIEkXojxvd1a Yg5LIIJpnWfOjSAJ5Nv+qRTXRFnLDHpwot+Fi7idbmthmlKpw6FOda+mtkDxiClrfC e2mGrlkV36LtYYvkxD7RnWwlE81I4QbNzw+qBXPXAmnSoffhv1JXIzNswkd7FXqLAz uHue0FThu/kGw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kuan-Wei Chiu , Andrii Nakryiko , Quentin Monnet , Sasha Levin , ast@kernel.org, daniel@iogearbox.net, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 6.10 194/197] bpftool: Fix undefined behavior caused by shifting into the sign bit Date: Wed, 25 Sep 2024 07:53:33 -0400 Message-ID: <20240925115823.1303019-194-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240925115823.1303019-1-sashal@kernel.org> References: <20240925115823.1303019-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: bpf@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.10.11 Content-Transfer-Encoding: 8bit From: Kuan-Wei Chiu [ Upstream commit 4cdc0e4ce5e893bc92255f5f734d983012f2bc2e ] Replace shifts of '1' with '1U' in bitwise operations within __show_dev_tc_bpf() to prevent undefined behavior caused by shifting into the sign bit of a signed integer. By using '1U', the operations are explicitly performed on unsigned integers, avoiding potential integer overflow or sign-related issues. Signed-off-by: Kuan-Wei Chiu Signed-off-by: Andrii Nakryiko Acked-by: Quentin Monnet Link: https://lore.kernel.org/bpf/20240908140009.3149781-1-visitorckw@gmail.com Signed-off-by: Sasha Levin --- tools/bpf/bpftool/net.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/bpf/bpftool/net.c b/tools/bpf/bpftool/net.c index 968714b4c3d45..ad2ea6cf2db11 100644 --- a/tools/bpf/bpftool/net.c +++ b/tools/bpf/bpftool/net.c @@ -482,9 +482,9 @@ static void __show_dev_tc_bpf(const struct ip_devname_ifindex *dev, if (prog_flags[i] || json_output) { NET_START_ARRAY("prog_flags", "%s "); for (j = 0; prog_flags[i] && j < 32; j++) { - if (!(prog_flags[i] & (1 << j))) + if (!(prog_flags[i] & (1U << j))) continue; - NET_DUMP_UINT_ONLY(1 << j); + NET_DUMP_UINT_ONLY(1U << j); } NET_END_ARRAY(""); } @@ -493,9 +493,9 @@ static void __show_dev_tc_bpf(const struct ip_devname_ifindex *dev, if (link_flags[i] || json_output) { NET_START_ARRAY("link_flags", "%s "); for (j = 0; link_flags[i] && j < 32; j++) { - if (!(link_flags[i] & (1 << j))) + if (!(link_flags[i] & (1U << j))) continue; - NET_DUMP_UINT_ONLY(1 << j); + NET_DUMP_UINT_ONLY(1U << j); } NET_END_ARRAY(""); } -- 2.43.0