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=-10.6 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 DB839C10F13 for ; Tue, 9 Apr 2019 00:10:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A9D7321473 for ; Tue, 9 Apr 2019 00:10:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="cSHTPp7z" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726538AbfDIAKN (ORCPT ); Mon, 8 Apr 2019 20:10:13 -0400 Received: from mail-ua1-f74.google.com ([209.85.222.74]:39301 "EHLO mail-ua1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726068AbfDIAKM (ORCPT ); Mon, 8 Apr 2019 20:10:12 -0400 Received: by mail-ua1-f74.google.com with SMTP id v5so1822293ual.6 for ; Mon, 08 Apr 2019 17:10:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=FlV4ppkTnpOWyj+P6mRSk1Eto+Nkd76W08vV35uVYPQ=; b=cSHTPp7zFfyrxGZzxByoH6J/Rhzvepx1ahiA8Cl867kVFrq9uS5UYUjg0UXlVvg35E tX27eXfnXt4664bBxgp7TmqroqgzTPatCIzqaQyndGNqj8qmE6mHzd+4k9gcdZqOQWKj uDvgmMQighPSSLOc3I2mUoQjupbEqF7hhz4kLgbouzdObc12nhKSJvJkJQ1i2XKttN13 pIBID6WKXr8KaM4kLQUXq7pVDgZjlcpyKqmt9W4bZuIDUDo4GC2GFBTmojSLDz6n7New cCzs2Q+Np8p35CgeCp6cvOy4ejcrHSReCcSLJc/Qr317F84h36J+OqG47R7TLHhQkqgY J9GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=FlV4ppkTnpOWyj+P6mRSk1Eto+Nkd76W08vV35uVYPQ=; b=YQSzkJSGjdYX+xrcYxxzSMianSd/yrGuCGn4NlDefUo703j4/Nu1GkD2sJGqEolzyV bTdChinkbaR2JKuxbO974n7RJUuu/MFuRwWFjr8aElA7LbjY2I4q0GCshZRg+nkcP653 +OmnI7JtKJHYLst3kcOuKAPZTJyQun8dOn89oXI0t10BzxdM4thygIZA49fV/DAWHNbU HwVa2WQRQf6V0hk/0zTkzfrEeP4CVCbFoNTGxqS2Nn4TILK0nsj4PNfhPhYHCZlZ75Ox 1jSQqsl1iLTrhj19AqjSeTianmHNhWy3O3IJJS8Jf0nC0j6YgbO2wf4rOGBEuC0tpCAE PpnA== X-Gm-Message-State: APjAAAUvApr0l86YbctxpNc7KyUakNDkKlenPoXw90fGH1MdA21SpXKs 5f77bIMc9m61Z5j7CgoHY7fa9Gex X-Google-Smtp-Source: APXvYqzgd6ozPP7FDB/VbZC8odbLIPTUp0+gEeForY1zkexCJsKChAsOib/tsIEb5/+DTMQSOGCYDDUF X-Received: by 2002:a67:ecc5:: with SMTP id i5mr3445924vsp.6.1554768611691; Mon, 08 Apr 2019 17:10:11 -0700 (PDT) Date: Mon, 8 Apr 2019 17:10:02 -0700 Message-Id: <20190409001005.255869-1-posk@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.21.0.392.gf8f6787159e-goog Subject: [PATCH 4.19 stable 0/3] net: ip6 defrag: backport fixes From: Peter Oskolkov To: Greg Kroah-Hartman , stable@vger.kernel.org, netdev@vger.kernel.org Cc: Peter Oskolkov , David Miller , Eric Dumazet , Sasha Levin , Captain Wiggum , Peter Oskolkov Content-Type: text/plain; charset="UTF-8" Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Currently, 4.19 and earlier stable kernels contain a security fix that is not fully IPv6 standard compliant. This patchset backports IPv6 defrag fixes from 5.1rc that restore standard-compliance. Original 5.1 patchet: https://patchwork.ozlabs.org/cover/1029418/ John Masinter (captwiggum), could you, please, confirm that this patchset fixes TAHI tests? Peter Oskolkov (3): net: IP defrag: encapsulate rbtree defrag code into callable functions net: IP6 defrag: use rbtrees for IPv6 defrag net: IP6 defrag: use rbtrees in nf_conntrack_reasm.c include/net/inet_frag.h | 16 +- include/net/ipv6_frag.h | 11 +- net/ipv4/inet_fragment.c | 293 ++++++++++++++++++++++++ net/ipv4/ip_fragment.c | 290 +++-------------------- net/ipv6/netfilter/nf_conntrack_reasm.c | 260 ++++++--------------- net/ipv6/reassembly.c | 233 +++++-------------- 6 files changed, 477 insertions(+), 626 deletions(-) -- 2.21.0.392.gf8f6787159e-goog