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=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 11FE3C43218 for ; Fri, 26 Apr 2019 15:41:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D75DC206E0 for ; Fri, 26 Apr 2019 15:41:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="mSftxYVE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726368AbfDZPlP (ORCPT ); Fri, 26 Apr 2019 11:41:15 -0400 Received: from mail-ua1-f74.google.com ([209.85.222.74]:33742 "EHLO mail-ua1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726206AbfDZPlO (ORCPT ); Fri, 26 Apr 2019 11:41:14 -0400 Received: by mail-ua1-f74.google.com with SMTP id h6so597732uab.0 for ; Fri, 26 Apr 2019 08:41:14 -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=7e1ilcp0VIZKLG9FvbTJJE7FZaWHAhpKrsoG8qOtoy0=; b=mSftxYVEVs/Y6S9bff7JunK3Npkwy7nY3Z731FLb8BXPx36f1WyOCaWymkIoscgOs+ alsuPa+LpJ2EQ5ItENmykbOnEfHTqUs5lyaWEN+5oNEZ6LDAHONk3f5NKqjd0IRIl1rh nvEnJGowPjWvNtx42v7hGSGgNjHo1mM081YlxNFYpH4OEHYdIkM4GUuqxawbLHNlqMUV iQx1vtYwWATGIxVHksix5Lp2Ghrz9XDI6+iFHyNoQwjAvrws7C62b5zWHgCtgC2oKUNB QOdrFtioep3iPG5o9nimOHhYPgEuxhdCAEkFLaqeh3kr7CdY82QnGxY5fcxaSzfYt/yX RPDQ== 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=7e1ilcp0VIZKLG9FvbTJJE7FZaWHAhpKrsoG8qOtoy0=; b=tKeVmt3saCUe/kYf4m/6vH4393pvvb2Uzs943AF9WrXf3aMiaYHhcqrS0V5NUtBM+T OE3mIm1Scvs7Jbrcf2pg/nsqrdsDQ93UlhS4Q6wCb6P5b3Z9TOhRD0sKCDmJcvsT4Ba2 1wzIQaX5+t5YZVc2OgUjXMNRCOgKO2u5lhoZhm6xZLS1CJuIjZJlY0dFOZP+IPPESw0q fkPZZWMQKAXm8DV+opRGOMh0bnCI2ngauiG8eG/dxY0UanMyh2IStcWctckNn7AUf4BQ rP2Q9ClnyBExZWoYwShADqX92Ok12GdwxohZj1ZgV9EwQdoGoPRU1zUivdPgx9kA5CTp /88A== X-Gm-Message-State: APjAAAX195u1PETH2COfCJVySB/9Jd/vMta9a2oeUMThC/wDzHdcUe0x 9Drb2PCv+eFXbAb8Jl9jEL9JFQWE X-Google-Smtp-Source: APXvYqw2Qph7igID+4W5xCp5d6UK0pB46zrIcQrrlTDAYtgat15uMTJeVzVA3hot0/Z/tVMbLbYfnugm X-Received: by 2002:a67:fdc4:: with SMTP id l4mr14616737vsq.1.1556293273524; Fri, 26 Apr 2019 08:41:13 -0700 (PDT) Date: Fri, 26 Apr 2019 08:41:03 -0700 Message-Id: <20190426154108.52277-1-posk@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.21.0.593.g511ec345e18-goog Subject: [PATCH 4.9 stable 0/5] 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 , Lars Persson , Peter Oskolkov Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This is a backport of a 5.1rc patchset: https://patchwork.ozlabs.org/cover/1029418/ Which was backported into 4.19: https://patchwork.ozlabs.org/cover/1081619/ and into 4.14: https://patchwork.ozlabs.org/cover/1089651/ This 4.9 patchset is very close to the 4.14 patchset above (cherry-picks from 4.14 were almost clean). Eric Dumazet (1): ipv6: frags: fix a lockdep false positive Florian Westphal (1): ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module 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.h | 29 -- include/net/ipv6_frag.h | 111 +++++++ net/ieee802154/6lowpan/reassembly.c | 2 +- net/ipv4/inet_fragment.c | 293 ++++++++++++++++++ net/ipv4/ip_fragment.c | 295 +++--------------- net/ipv6/netfilter/nf_conntrack_reasm.c | 273 +++++----------- net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 3 +- net/ipv6/reassembly.c | 361 ++++++---------------- net/openvswitch/conntrack.c | 1 + 10 files changed, 631 insertions(+), 753 deletions(-) create mode 100644 include/net/ipv6_frag.h -- 2.21.0.593.g511ec345e18-goog