From patchwork Tue Mar 26 11:33:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Tenart X-Patchwork-Id: 13603961 X-Patchwork-Delegate: kuba@kernel.org 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 DD5E056452 for ; Tue, 26 Mar 2024 11:34: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=1711452852; cv=none; b=tJlvp/+3le1DeZU58cJanZSL4GAOs3qaSg21doc+ZMDZHxkLioE9EG9v5vk4PvLKqwrUmEKIQnQAM3wDjztaSFB/GW09ZRigQV+YNKKvc/ZXrYcf9tApe3biyPd8VnDy9M7JNzjBUtJSndSQ8hPnyTzDFWE2Ap5HW12vTKHRhiI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711452852; c=relaxed/simple; bh=9AGZg+Pbqwe5RkEz1eQH+VUG1GXVEpPCjOgQ8W1uVY4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gLGuowG5VxqUPUgN7rtQaVNm5b0unRFNRLUSzUmXcB71vhaVco2/2rVgoo1Rmq2AGBYFF2fiM3yZRb+HXWNkh3zQglCmC/KyFzfAJqfa5AZV++afV1HugbOnypQn/n4h2swvjND9kaBafZr3pDy8EGhrihkNi07bhev2P5iTfCk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=c5airom1; 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="c5airom1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E2D74C433C7; Tue, 26 Mar 2024 11:34:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711452852; bh=9AGZg+Pbqwe5RkEz1eQH+VUG1GXVEpPCjOgQ8W1uVY4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c5airom1AIzxqXyoNJv3CWbN28BpUAQMTE3KwKnF8byzRkm9/R6OQ5dfAQ7bYiOjy amnGX15vn5zocJE3RUCHK1qORYcAlHHl3vAbtvgmewRtF5geEmeFWMaBq5BVhirE+O zgo2dqnQnaovggrhS9kEiJLsGyl5+t88FMDzr6MJ/Urc/4iKhe8PbyhA6ozqGNEmJX YCYlMg9vPQ2znQDokVkO3CP56ZyUG8s1KLN+3pv6OslmwDGIsxaNFM3VsfaiVqP5Lc Rs9hqnPVpep+X31yyRl5Y3CdGqbAU03uk02gc/dSf8iLKW4r9Op41gf0uW28LEVNGc ymbpFAug1leVw== From: Antoine Tenart To: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com Cc: Antoine Tenart , steffen.klassert@secunet.com, willemdebruijn.kernel@gmail.com, netdev@vger.kernel.org, Willem de Bruijn Subject: [PATCH net v4 2/5] gro: fix ownership transfer Date: Tue, 26 Mar 2024 12:33:59 +0100 Message-ID: <20240326113403.397786-3-atenart@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240326113403.397786-1-atenart@kernel.org> References: <20240326113403.397786-1-atenart@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org If packets are GROed with fraglist they might be segmented later on and continue their journey in the stack. In skb_segment_list those skbs can be reused as-is. This is an issue as their destructor was removed in skb_gro_receive_list but not the reference to their socket, and then they can't be orphaned. Fix this by also removing the reference to the socket. For example this could be observed, kernel BUG at include/linux/skbuff.h:3131! (skb_orphan) RIP: 0010:ip6_rcv_core+0x11bc/0x19a0 Call Trace: ipv6_list_rcv+0x250/0x3f0 __netif_receive_skb_list_core+0x49d/0x8f0 netif_receive_skb_list_internal+0x634/0xd40 napi_complete_done+0x1d2/0x7d0 gro_cell_poll+0x118/0x1f0 A similar construction is found in skb_gro_receive, apply the same change there. Fixes: 5e10da5385d2 ("skbuff: allow 'slow_gro' for skb carring sock reference") Signed-off-by: Antoine Tenart Reviewed-by: Willem de Bruijn --- net/core/gro.c | 3 ++- net/ipv4/udp_offload.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/net/core/gro.c b/net/core/gro.c index ee30d4f0c038..83f35d99a682 100644 --- a/net/core/gro.c +++ b/net/core/gro.c @@ -192,8 +192,9 @@ int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb) } merge: - /* sk owenrship - if any - completely transferred to the aggregated packet */ + /* sk ownership - if any - completely transferred to the aggregated packet */ skb->destructor = NULL; + skb->sk = NULL; delta_truesize = skb->truesize; if (offset > headlen) { unsigned int eat = offset - headlen; diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c index e9719afe91cf..3bb69464930b 100644 --- a/net/ipv4/udp_offload.c +++ b/net/ipv4/udp_offload.c @@ -449,8 +449,9 @@ static int skb_gro_receive_list(struct sk_buff *p, struct sk_buff *skb) NAPI_GRO_CB(p)->count++; p->data_len += skb->len; - /* sk owenrship - if any - completely transferred to the aggregated packet */ + /* sk ownership - if any - completely transferred to the aggregated packet */ skb->destructor = NULL; + skb->sk = NULL; p->truesize += skb->truesize; p->len += skb->len;