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 6D86215F306; Mon, 27 May 2024 14:12:31 +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=1716819151; cv=none; b=RkcEgSf8n3xpLDdGYoizJj0avETYT5aO7W33Gps8cmuMqLW2dix8wTQecESgM6I6Mg3cF7rfLfi5c5SpLb0JxokThRRa0p/i2zALbl0n3Iw9kucHGXj6lx6v6u9x5N+vE49l3UVut5ko+5uJauVBmo6wFqGXv5hIdvIlFfN8jgQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716819151; c=relaxed/simple; bh=eM1G5cPfDPG4q4wc0zKWCZzc2b2OiE56DwIDja4stPw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RpzHHxClHmmvpJ7ObKXnd9yImm6Zxit/Jgy+VAZ+jJVNNbGgL81mt6O6AIYdfDCdDuQHXOhehbdtiYC4yhS/TxNxvynoDCk0CbspbBst4jo4WrMSrUCzs43npJxNZ+uyVp0soi5TNHo+oWKUNo9kdVmjjx9J3atlFDFpLMod7hc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nUPV86Hd; 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="nUPV86Hd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F082BC2BBFC; Mon, 27 May 2024 14:12:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716819151; bh=eM1G5cPfDPG4q4wc0zKWCZzc2b2OiE56DwIDja4stPw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nUPV86HdiaRb4Y/m6+T3QdVIrboTzGkkdvhXmJDe8RaxWTNwPt8JaEDoOuvqdEzIp kW7yqn83BZBrM6HwebcbSYQnz8ldISrIy6yX15jKDVyu+jOtmLxnYvAKqxuqZwSeef fsnN8eh6KpoJxapEDswsOvkmkl5Gf+sGZ9YE045EI6ihotvP8DX9ghSJdS5xHuNIOx 9D+opXYesX+bY54DzG3B+0N/n5fX6qorY+4XS0D0jKnzHcOoFERjRBJtV5aV/+ItS2 M+SbIcndO2EO5HhBNXxerrH+59gMtBr3TbyrLwPK8DEnmM/bYct6Gy6ZigiR9WyMq/ vSGeuEyLu5qfw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Eric Dumazet , syzbot , Kees Cook , Willem de Bruijn , Willem de Bruijn , "David S . Miller" , Sasha Levin , kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.9 09/35] af_packet: avoid a false positive warning in packet_setsockopt() Date: Mon, 27 May 2024 10:11:14 -0400 Message-ID: <20240527141214.3844331-9-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240527141214.3844331-1-sashal@kernel.org> References: <20240527141214.3844331-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.9.2 Content-Transfer-Encoding: 8bit From: Eric Dumazet [ Upstream commit 86d43e2bf93ccac88ef71cee36a23282ebd9e427 ] Although the code is correct, the following line copy_from_sockptr(&req_u.req, optval, len)); triggers this warning : memcpy: detected field-spanning write (size 28) of single field "dst" at include/linux/sockptr.h:49 (size 16) Refactor the code to be more explicit. Reported-by: syzbot Signed-off-by: Eric Dumazet Cc: Kees Cook Cc: Willem de Bruijn Reviewed-by: Kees Cook Reviewed-by: Willem de Bruijn Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/packet/af_packet.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 18f616f487eaa..8c6d3fbb4ed87 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -3800,28 +3800,30 @@ packet_setsockopt(struct socket *sock, int level, int optname, sockptr_t optval, case PACKET_TX_RING: { union tpacket_req_u req_u; - int len; + ret = -EINVAL; lock_sock(sk); switch (po->tp_version) { case TPACKET_V1: case TPACKET_V2: - len = sizeof(req_u.req); + if (optlen < sizeof(req_u.req)) + break; + ret = copy_from_sockptr(&req_u.req, optval, + sizeof(req_u.req)) ? + -EINVAL : 0; break; case TPACKET_V3: default: - len = sizeof(req_u.req3); + if (optlen < sizeof(req_u.req3)) + break; + ret = copy_from_sockptr(&req_u.req3, optval, + sizeof(req_u.req3)) ? + -EINVAL : 0; break; } - if (optlen < len) { - ret = -EINVAL; - } else { - if (copy_from_sockptr(&req_u.req, optval, len)) - ret = -EFAULT; - else - ret = packet_set_ring(sk, &req_u, 0, - optname == PACKET_TX_RING); - } + if (!ret) + ret = packet_set_ring(sk, &req_u, 0, + optname == PACKET_TX_RING); release_sock(sk); return ret; } -- 2.43.0