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=-5.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_PASS,USER_AGENT_MUTT 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 81A04C43381 for ; Tue, 2 Apr 2019 06:39:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4FC772070B for ; Tue, 2 Apr 2019 06:39:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554187142; bh=rV6yT9RH8bl0OCSwKzMbhBvbGfziC6POfO2GsK3Xc/U=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=v59ThQpjOU1iihCK9gOVzeDyEHMnOg7cO5Gt/sor8Jtml38MeRQC8kSSgiEvq1mPz ar92OvXK6Z8lGf1zOgSCDjH5FaHScSg+Nh7IvqwuokyQ/KwuoB2ypjLuT23jPgQxTp OvJ9osSQ7om4a5NZtaTMqDpFRRcxoS1cUDTmNT3E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729111AbfDBGjB (ORCPT ); Tue, 2 Apr 2019 02:39:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:37134 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728359AbfDBGjB (ORCPT ); Tue, 2 Apr 2019 02:39:01 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 79B35206BA; Tue, 2 Apr 2019 06:39:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554187140; bh=rV6yT9RH8bl0OCSwKzMbhBvbGfziC6POfO2GsK3Xc/U=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=pwb5aPxnBlQifYzSk1VUan4ZadyKjLtWmPnbhr+yFvfCFwebZHxAlY6VZPYjZLxWK 3Tu2X5Ug7KaTZl5fh5DOtpFNatOfvb+sGTykM9orEgunsg3OQk3R1FNk1xncHhLczi bqa9vEymLge2clKYvLycohnpeXLhE0RurXV/t4EQ= Date: Tue, 2 Apr 2019 08:38:53 +0200 From: Greg Kroah-Hartman To: Captain Wiggum Cc: Florian Westphal , Eric Dumazet , Peter Oskolkov , netdev@vger.kernel.org, stable@vger.kernel.org Subject: Re: Please merge IPv6 fix for drop fragment smaller than MTU Message-ID: <20190402063853.GC7218@kroah.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.11.4 (2019-03-13) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Mon, Apr 01, 2019 at 03:34:52PM -0600, Captain Wiggum wrote: > Hi Greg, > > An error was introduced in 4.9.134 (and the other LTS branches also). > This causes 18 test cases from the TAHI IPv6 test suite to fail. > I added you to the mail thread about this subject a month back. > It has been fixed in upstream for some time now, but not in the LTS branches. > Please merge this undo-patch into the LTS branches. > > $ git diff a8444b1ccb20339774af58e40ad42296074fb484 > a8444b1ccb20339774af58e40ad42296074fb484~ > > diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c > b/net/ipv6/netfilter/nf_conntrack_reasm.c > index b815417..ff49d1f 100644 > --- a/net/ipv6/netfilter/nf_conntrack_reasm.c > +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c > @@ -564,10 +564,6 @@ int nf_ct_frag6_gather(struct net *net, struct > sk_buff *skb, u32 user) > hdr = ipv6_hdr(skb); > fhdr = (struct frag_hdr *)skb_transport_header(skb); > > - if (skb->len - skb_network_offset(skb) < IPV6_MIN_MTU && > - fhdr->frag_off & htons(IP6_MF)) > - return -EINVAL; > - > skb_orphan(skb); > fq = fq_find(net, fhdr->identification, user, hdr, > skb->dev ? skb->dev->ifindex : 0); > diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c > index 78656bb..dbe726c 100644 > --- a/net/ipv6/reassembly.c > +++ b/net/ipv6/reassembly.c > @@ -516,10 +516,6 @@ static int ipv6_frag_rcv(struct sk_buff *skb) > return 1; > } > > - if (skb->len - skb_network_offset(skb) < IPV6_MIN_MTU && > - fhdr->frag_off & htons(IP6_MF)) > - goto fail_hdr; > - > iif = skb->dev ? skb->dev->ifindex : 0; > fq = fq_find(net, fhdr->identification, hdr, iif); > if (fq) { I can't take a random, white-space damaged patch to a stable kernel tree without it being submitted in a format that I can apply it in at the very least :( Also, please always cc: stable@vger.kernel.org for stable kernel things, the documentation: https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html should have explained all of this, and if not, please let us know what needs to be improved there. If you can resend this there, and mention the needed follow-on patches, I will be glad to queue it up. thanks, greg k-h