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 BEB211C68BE; Mon, 27 May 2024 14:17:34 +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=1716819454; cv=none; b=pVJa3SjOdJq2hGT2zmHVXsgaBFMGIQGKe21xmpEbi1emid7cCSlZE27d9EslmqBd0FcTOdNuPU+vzQVdC12NsHcHOttm0Sd/G41I3axGTC8+4MdR71iXTf9j/jNwitnLsHhR/TKVYNxu7YYxRBpNsL/OzgMcExwYhV+SzFKd/EA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716819454; c=relaxed/simple; bh=TQDp9HsIwiDYDUPm1MC+CkoxvuKzKVKoemyWftSyW9I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CI6cspJGCSU+Pxz2xUGIIkmIAb+bURW2lFTB9Laqpdoc3iRIXTn/ho6sxs4MofxBjJQD7d9WWsEnGRoIJ2UkA8Fj59jrG5oI6CXVsOuOE8KTaBa2RcKbW6hXpR/cQNySJtZSognpV/B02uZGGq+afGIPDktV6/wpv5poCZKUeSA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=amydabxf; 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="amydabxf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 065D0C4AF09; Mon, 27 May 2024 14:17:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716819454; bh=TQDp9HsIwiDYDUPm1MC+CkoxvuKzKVKoemyWftSyW9I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=amydabxfRPrg0eSpRHlINJA06BrX1Kt43k39FN/Ny49FURAVWYmQxiOdCA+3w+3EE pSHKNmujlqYqCA9edX39Kmu3QK/NJPFSsyztXebXJabHT188s2ojEoLueCa7aDpY7t nMGcKBlEVY976nQIkQHa8fWs66mmdJHOJTb10e3aYSaCcVJY8K6EK24RDhe8D3yIgf cD7ZbGQXDHqcsaOwLMq7US6ST1FtJcEXLF4pikZfH5H4yFkiXEaVbuwupQEjKED1zj NhOUZ7flXM4BpkhlMm8am3nfeh0exevZYecUk83c6uAu/ZyaWVH+lMHFQvZnHE6Nq9 xqndcUoitarsQ== 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.1 05/17] af_packet: avoid a false positive warning in packet_setsockopt() Date: Mon, 27 May 2024 10:16:42 -0400 Message-ID: <20240527141712.3853988-5-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240527141712.3853988-1-sashal@kernel.org> References: <20240527141712.3853988-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.1.92 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 7188ca8d84693..952fde1aab2d6 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -3792,28 +3792,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