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=-3.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_NEOMUTT autolearn=unavailable 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 47E7BC28CC6 for ; Tue, 4 Jun 2019 16:03:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 221132053B for ; Tue, 4 Jun 2019 16:03:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728225AbfFDQDL (ORCPT ); Tue, 4 Jun 2019 12:03:11 -0400 Received: from mail.us.es ([193.147.175.20]:52008 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727422AbfFDQDL (ORCPT ); Tue, 4 Jun 2019 12:03:11 -0400 Received: from antivirus1-rhel7.int (unknown [192.168.2.11]) by mail.us.es (Postfix) with ESMTP id 7415B6D004 for ; Tue, 4 Jun 2019 18:03:08 +0200 (CEST) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id 65906DA70D for ; Tue, 4 Jun 2019 18:03:08 +0200 (CEST) Received: by antivirus1-rhel7.int (Postfix, from userid 99) id 5A6EBDA708; Tue, 4 Jun 2019 18:03:08 +0200 (CEST) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id 59188DA706; Tue, 4 Jun 2019 18:03:06 +0200 (CEST) Received: from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int (F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); Tue, 04 Jun 2019 18:03:06 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int) Received: from us.es (barqueta.lsi.us.es [150.214.188.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: 1984lsi) by entrada.int (Postfix) with ESMTPSA id 4775F4265A2F; Tue, 4 Jun 2019 18:03:06 +0200 (CEST) Date: Tue, 4 Jun 2019 18:03:05 +0200 X-SMTPAUTHUS: auth mail.us.es From: Pablo Neira Ayuso To: Guillaume Nault Cc: netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, Peter Oskolkov , Florian Westphal , "David S. Miller" Subject: Re: [PATCH net] netfilter: ipv6: nf_defrag: fix leakage of unqueued fragments Message-ID: <20190604160305.7bpwsjsjoosj2szt@salvia> References: <51d82a9bd6312e51a56ccae54e00452a0ef957dd.1559480671.git.gnault@redhat.com> <20190604132605.jlhxljrzaqkw4f2j@salvia> <20190604150218.GA12962@linux.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190604150218.GA12962@linux.home> User-Agent: NeoMutt/20170113 (1.7.2) X-Virus-Scanned: ClamAV using ClamSMTP Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org On Tue, Jun 04, 2019 at 05:02:21PM +0200, Guillaume Nault wrote: > On Tue, Jun 04, 2019 at 03:26:05PM +0200, Pablo Neira Ayuso wrote: > > On Sun, Jun 02, 2019 at 03:13:47PM +0200, Guillaume Nault wrote: > > > With commit 997dd9647164 ("net: IP6 defrag: use rbtrees in > > > nf_conntrack_reasm.c"), nf_ct_frag6_reasm() is now called from > > > nf_ct_frag6_queue(). With this change, nf_ct_frag6_queue() can fail > > > after the skb has been added to the fragment queue and > > > nf_ct_frag6_gather() was adapted to handle this case. > > > > Applied, thanks. > > Thanks. Can you also please queue it for -stable? As soon as this hits Linus tree, yes.