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 727D022CAE7; Wed, 25 Sep 2024 12:18:05 +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=1727266685; cv=none; b=RFtPF4ElqrcNrpz+OVD3lCfmiT/wLt3jlq4/KFmlJSKNFXRqZKdTw+xO8CL9w8AzdHH7xdsktiOJCzkCG4QE1UJx7zjsIa+WDr4xv7cVpMDvDu4e4nX1v+i4IHxTtkW3aeJHsOdivcsddiwOHP8bZ6ZSQ53sOa+ELojhj9VBFwU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727266685; c=relaxed/simple; bh=I0j8h49y35gscCvaporhvUpZsz7lOdZ0PCpiIdW3MQw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uDNuHb9akLxgUBR1p6aBPICymtviP02Sd46EBX+bj39hXHONPSubUB3UTfwD1WZffLlcl/DB++roaYR6Z95zMSgS7lUWGgSmxq3MATJ6cYqRSnMG9HzdYOw25C/7biS448JqcYoEiCPpB7r2eNQMqOGZH97tM0Hyu351Mpq/jec= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BS41qxdX; 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="BS41qxdX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E9F4C4CEC9; Wed, 25 Sep 2024 12:18:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727266685; bh=I0j8h49y35gscCvaporhvUpZsz7lOdZ0PCpiIdW3MQw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BS41qxdXu5cZ94ZEJgw6I51L/kdhTXORcvEMZaaOr2PEia6FG4tZy8vvS9ds0MxeV DkZmrROsUUFhpBrgwCAF1S/EKeKb8EJI+MzKexHs7BSoa8aOw8IMQmb+YI69AiwwUH 7cFVmH2JNwJWbWAPGc+MA0w7OG5mWSJYDwOBQ4YcuoKfdZRMCiP/9wkg+AzhQtnd52 RjvG9yoISIpvcthdRoy7rF+H/apIIfRJa7q3M2THVX3k9C0f4vz2tex8K4kQXNxNgN SdrsfKnAXU6f1N7SYVcK27PTqcEniFRloWc42138yk3yjfJX3uVwu5xkbJGmIlr8n0 gGs5tCPneA7xQ== 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.6 137/139] bpftool: Fix undefined behavior caused by shifting into the sign bit Date: Wed, 25 Sep 2024 08:09:17 -0400 Message-ID: <20240925121137.1307574-137-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240925121137.1307574-1-sashal@kernel.org> References: <20240925121137.1307574-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.52 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 66a8ce8ae0127..fd54ff436493f 100644 --- a/tools/bpf/bpftool/net.c +++ b/tools/bpf/bpftool/net.c @@ -480,9 +480,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(""); } @@ -491,9 +491,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