Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp219343pxu; Thu, 7 Jan 2021 03:09:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJzvr0fjb8kHnCKJZvGbYrhId4ikx4fKeyRShZdLjc83GuMy8F8qO+nL4wVWtkHovgQrJWWZ X-Received: by 2002:a50:c209:: with SMTP id n9mr1288272edf.123.1610017761389; Thu, 07 Jan 2021 03:09:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610017761; cv=none; d=google.com; s=arc-20160816; b=ejVCAT0c7IO0mbSF8Ns6ucB/fqu0kkkx6nLo6pf3a8cGLvG+aNaPBjBmRzsZrgtodU 4MEUFSovFtYxxSqG22SkqjS7Z/vWG3xxde83hxFk+n8fw6nEotIIusMLhpdUbwLOUFaU 0Zw5mXv/JhWwpMsg6QlkIMI/dOJU9cL0Oi+5kSQvJPJRkaEdurtLg6Mo125NYwJdILVe gn8ohakjQIJgZsDOUuN4drRBqxue3jN89yY4zjKUapCRXVNhlj7keXh8Qruw76cZEK4H Zmkn8i/YaWmc9Z059vsYcVm5U0FJdqXHX8Xby/p1dli7mBpgvfkF34QeV5MtZSTeF4gY JNuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :in-reply-to:mime-version:user-agent:date:message-id:from:references :cc:to:subject; bh=8xpBYgD4qIHjrAljKdaA+60E02vjmckREzT0xbPzD/I=; b=stYrhkwfOLNDA1nA523u35pyoyd9HF9I4t7E2q4ldGcAcf4KBerSB037FYC5sNuxpN MXpboTuNpNkDBlOm/62wTdMD51YajcmzEUqeMJxTee3JP6N0m4IAiN3OgtgmPWgejrba qkdOHNTm0B1tgnPVwoZN14DWCmHGgLulPnik7fUROxW1oQ90Ko+HkESsb+dOA2PJtElO XTEzJW4o7ED+z/18ItptaVcXTc8Nx8Ll4VP0CotawjiDxESN4Atr9sObAdLBilypBya9 tP1Jc/8bze1JH0L9ZchTS3ykxsExkWjbiD8m4276AgoQDE99sAOGmkoiYIVx8iNB0Bce tfKw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id mm17si1994004ejb.131.2021.01.07.03.08.54; Thu, 07 Jan 2021 03:09:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727446AbhAGLGl (ORCPT + 99 others); Thu, 7 Jan 2021 06:06:41 -0500 Received: from www62.your-server.de ([213.133.104.62]:43364 "EHLO www62.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726151AbhAGLGk (ORCPT ); Thu, 7 Jan 2021 06:06:40 -0500 Received: from sslproxy02.your-server.de ([78.47.166.47]) by www62.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92.3) (envelope-from ) id 1kxT6o-0009mh-Vb; Thu, 07 Jan 2021 12:05:39 +0100 Received: from [85.7.101.30] (helo=pc-9.home) by sslproxy02.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kxT6o-000QhI-Ia; Thu, 07 Jan 2021 12:05:38 +0100 Subject: Re: [PATCH net v2] net: fix use-after-free when UDP GRO with shared fraglist To: Dongseok Yi , "David S. Miller" , Willem de Bruijn Cc: Jakub Kicinski , Miaohe Lin , Paolo Abeni , Florian Westphal , Al Viro , Guillaume Nault , Yunsheng Lin , Steffen Klassert , Yadu Kishore , Marco Elver , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, namkyu78.kim@samsung.com References: <1609750005-115609-1-git-send-email-dseok.yi@samsung.com> <1609979953-181868-1-git-send-email-dseok.yi@samsung.com> From: Daniel Borkmann Message-ID: <83a2b288-c0b2-ed98-9479-61e1cbe25519@iogearbox.net> Date: Thu, 7 Jan 2021 12:05:36 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.2 MIME-Version: 1.0 In-Reply-To: <1609979953-181868-1-git-send-email-dseok.yi@samsung.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Authenticated-Sender: daniel@iogearbox.net X-Virus-Scanned: Clear (ClamAV 0.102.4/26041/Wed Jan 6 13:36:32 2021) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 1/7/21 1:39 AM, Dongseok Yi wrote: > skbs in fraglist could be shared by a BPF filter loaded at TC. It > triggers skb_ensure_writable -> pskb_expand_head -> > skb_clone_fraglist -> skb_get on each skb in the fraglist. > > While tcpdump, sk_receive_queue of PF_PACKET has the original fraglist. > But the same fraglist is queued to PF_INET (or PF_INET6) as the fraglist > chain made by skb_segment_list. > > If the new skb (not fraglist) is queued to one of the sk_receive_queue, > multiple ptypes can see this. The skb could be released by ptypes and > it causes use-after-free. > > [ 4443.426215] ------------[ cut here ]------------ > [ 4443.426222] refcount_t: underflow; use-after-free. > [ 4443.426291] WARNING: CPU: 7 PID: 28161 at lib/refcount.c:190 > refcount_dec_and_test_checked+0xa4/0xc8 > [ 4443.426726] pstate: 60400005 (nZCv daif +PAN -UAO) > [ 4443.426732] pc : refcount_dec_and_test_checked+0xa4/0xc8 > [ 4443.426737] lr : refcount_dec_and_test_checked+0xa0/0xc8 > [ 4443.426808] Call trace: > [ 4443.426813] refcount_dec_and_test_checked+0xa4/0xc8 > [ 4443.426823] skb_release_data+0x144/0x264 > [ 4443.426828] kfree_skb+0x58/0xc4 > [ 4443.426832] skb_queue_purge+0x64/0x9c > [ 4443.426844] packet_set_ring+0x5f0/0x820 > [ 4443.426849] packet_setsockopt+0x5a4/0xcd0 > [ 4443.426853] __sys_setsockopt+0x188/0x278 > [ 4443.426858] __arm64_sys_setsockopt+0x28/0x38 > [ 4443.426869] el0_svc_common+0xf0/0x1d0 > [ 4443.426873] el0_svc_handler+0x74/0x98 > [ 4443.426880] el0_svc+0x8/0xc > > Fixes: 3a1296a38d0c (net: Support GRO/GSO fraglist chaining.) > Signed-off-by: Dongseok Yi > Acked-by: Willem de Bruijn > --- > net/core/skbuff.c | 20 +++++++++++++++++++- > 1 file changed, 19 insertions(+), 1 deletion(-) > > v2: Expand the commit message to clarify a BPF filter loaded > > diff --git a/net/core/skbuff.c b/net/core/skbuff.c > index f62cae3..1dcbda8 100644 > --- a/net/core/skbuff.c > +++ b/net/core/skbuff.c > @@ -3655,7 +3655,8 @@ struct sk_buff *skb_segment_list(struct sk_buff *skb, > unsigned int delta_truesize = 0; > unsigned int delta_len = 0; > struct sk_buff *tail = NULL; > - struct sk_buff *nskb; > + struct sk_buff *nskb, *tmp; > + int err; > > skb_push(skb, -skb_network_offset(skb) + offset); > > @@ -3665,11 +3666,28 @@ struct sk_buff *skb_segment_list(struct sk_buff *skb, > nskb = list_skb; > list_skb = list_skb->next; > > + err = 0; > + if (skb_shared(nskb)) { > + tmp = skb_clone(nskb, GFP_ATOMIC); > + if (tmp) { > + kfree_skb(nskb); Should use consume_skb() to not trigger skb:kfree_skb tracepoint when looking for drops in the stack. > + nskb = tmp; > + err = skb_unclone(nskb, GFP_ATOMIC); Could you elaborate why you also need to unclone? This looks odd here. tc layer (independent of BPF) from ingress & egress side generally assumes unshared skb, so above clone + dropping ref of nskb looks okay to make the main skb struct private for mangling attributes (e.g. mark) & should suffice. What is the exact purpose of the additional skb_unclone() in this context? > + } else { > + err = -ENOMEM; > + } > + } > + > if (!tail) > skb->next = nskb; > else > tail->next = nskb; > > + if (unlikely(err)) { > + nskb->next = list_skb; > + goto err_linearize; > + } > + > tail = nskb; > > delta_len += nskb->len; >