From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7CFE1C4320A for ; Thu, 29 Jul 2021 03:19:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 568F06101C for ; Thu, 29 Jul 2021 03:19:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233488AbhG2DTJ (ORCPT ); Wed, 28 Jul 2021 23:19:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233507AbhG2DTH (ORCPT ); Wed, 28 Jul 2021 23:19:07 -0400 Received: from out0.migadu.com (out0.migadu.com [IPv6:2001:41d0:2:267::]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68F72C061757; Wed, 28 Jul 2021 20:19:04 -0700 (PDT) MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1627528742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=F00D1B8fJlYlyOskFlI65HCDbK3t3Y9UGUyxuEUxhIc=; b=Yxw0jhdmkoSGZwZvREiQVjaFOw7JA2sJ3bpT2OARKuayiLGhRPtRY/2SvC8rMxF3sT47os 9qvGwLYQGRQkL5NEFogHgIFEfd/89Vv2vlUbabLZDhgrPzKIo+huDuzAOVaXghlnpz+Xm9 Yd+ywCR3qKJUkfR6uWczIbIFnR/K9CM= Date: Thu, 29 Jul 2021 03:19:01 +0000 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: yajun.deng@linux.dev Message-ID: Subject: Re: [PATCH] netfilter: nf_conntrack_bridge: Fix not free when error To: "Pablo Neira Ayuso" Cc: kadlec@netfilter.org, fw@strlen.de, roopa@nvidia.com, nikolay@nvidia.com, davem@davemloft.net, kuba@kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, bridge@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20210728161849.GA10433@salvia> References: <20210728161849.GA10433@salvia> <20210726035702.11964-1-yajun.deng@linux.dev> X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: yajun.deng@linux.dev Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org July 29, 2021 12:18 AM, "Pablo Neira Ayuso" wrote:= =0A=0A> On Mon, Jul 26, 2021 at 11:57:02AM +0800, Yajun Deng wrote:=0A> = =0A>> It should be added kfree_skb_list() when err is not equal to zero= =0A>> in nf_br_ip_fragment().=0A>> =0A>> Fixes: 3c171f496ef5 ("netfilter:= bridge: add connection tracking system")=0A>> Signed-off-by: Yajun Deng = =0A>> ---=0A>> net/bridge/netfilter/nf_conntrack_br= idge.c | 12 ++++++++----=0A>> 1 file changed, 8 insertions(+), 4 deletion= s(-)=0A>> =0A>> diff --git a/net/bridge/netfilter/nf_conntrack_bridge.c= =0A>> b/net/bridge/netfilter/nf_conntrack_bridge.c=0A>> index 8d033a75a76= 6..059f53903eda 100644=0A>> --- a/net/bridge/netfilter/nf_conntrack_bridg= e.c=0A>> +++ b/net/bridge/netfilter/nf_conntrack_bridge.c=0A>> @@ -83,12 = +83,16 @@ static int nf_br_ip_fragment(struct net *net, struct sock *sk,= =0A>> =0A>> skb->tstamp =3D tstamp;=0A>> err =3D output(net, sk, data, sk= b);=0A>> - if (err || !iter.frag)=0A>> - break;=0A>> -=0A>> + if (err) {= =0A>> + kfree_skb_list(iter.frag);=0A>> + return err;=0A>> + }=0A>> +=0A>= > + if (!iter.frag)=0A>> + return 0;=0A>> +=0A>> skb =3D ip_fraglist_next= (&iter);=0A>> }=0A>> - return err;=0A> =0A> Why removing this line above?= It enters slow_path: on success.=0A> =0AI used return rather than break,= it wouldn't enter the slow_path.=0A> This patch instead will keep this a= ligned with IPv6.=0A> =0AI think err and !iter.frag are not related, ther= e is no need to put them in an if statement,=0AWe still need to separate = them after loop. So I separate them in loop and use return instead=0Aof b= reak. In addition, if you insist, I will accept your patch.=0A>> }=0A>> s= low_path:=0A>> /* This is a linearized skbuff, the original geometry is l= ost for us.=0A>> --=0A>> 2.32.0