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 BB3C3C282DD for ; Tue, 23 Apr 2019 17:48:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8BAAA214AE for ; Tue, 23 Apr 2019 17:48:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="tlumL5/E" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729278AbfDWRsa (ORCPT ); Tue, 23 Apr 2019 13:48:30 -0400 Received: from mail-vk1-f201.google.com ([209.85.221.201]:32820 "EHLO mail-vk1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728888AbfDWRsa (ORCPT ); Tue, 23 Apr 2019 13:48:30 -0400 Received: by mail-vk1-f201.google.com with SMTP id v21so7354463vke.0 for ; Tue, 23 Apr 2019 10:48:30 -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=UayX3AqPjxwehtqsMLBYuG4SLGAC86+Igh9EbJFHQlQ=; b=tlumL5/EaLr7o2TdxIPt05qy6DWKqnrXB987a10hvqyFZRQmgSdfeOVPfx/1qvaf7Z P8Aw+vbyBfqb69O/C2EwieqEv74nIdDetzNtYN+O301fDqYYOZpRviSFMSV5Mvs2zyKr 4Urs84KxaMmZooNZ2e+lGFsXmjUXBNUkhU8ijbad1ZpXniQmO4l8AMQcFWvCkes+yDH0 LNS2yEmT4ORJ8F4hhWRkveo+XgoVAI6Qm4eFQv9n/S4y2ReHq4+RN4zKGMm6LYO7ICYJ jqCs4wHdZ6cKcrG7OobwFlcilRccTHXPF9J09l4hQPIfLfCiSv8CQSWLXrGoPQseFeSd 9QRw== 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=UayX3AqPjxwehtqsMLBYuG4SLGAC86+Igh9EbJFHQlQ=; b=DmJDbHihrNv8k4JwqRVQmiRlLlxSZPre7TnHOtQn08kVWrhGKWhDEnMhFEL0aV4lhT ltdy7hvu+CnADopWnJNGrgxbLu44OTHXPmB8IrPMirK3jI9nWrJjGLxOHLpnHahki/u6 HQjqBU5JSwYlrJrD58nY0eRgnM2uGfKhOvZYzJ+fiGawuC6FUnq47UF9lwZzfiCkjEgf SwKh5lQOfyEX+9VtHUtGTrDABtoG20MI5ZHs4bH0o69Jl82FdsfGeY/9wWDoQaaWYJl7 McIXEJli9+PPMLvKx7zV1kT/RDEgeQnFGCljlhRPeR+dQE99e2MBWGDbFjnhBmoCSyxN WxBw== X-Gm-Message-State: APjAAAVBRn/dMkFY4vxIRMNi4mIpZ4poUm5JpWTgWnwQ0e2EDhMeHZb5 FeakOarn2FkYglquuZ+lAbB/mDmn X-Google-Smtp-Source: APXvYqzZC4GGN3S6snErvBCyMbFyXg9VL3bm0iZWi9V9YWnEiOg6X9WFzJQ6dGKBPsCpa7mfGuOQDb1z X-Received: by 2002:a67:ee98:: with SMTP id n24mr14507715vsp.155.1556041709481; Tue, 23 Apr 2019 10:48:29 -0700 (PDT) Date: Tue, 23 Apr 2019 10:48:20 -0700 Message-Id: <20190423174825.24810-1-posk@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.21.0.593.g511ec345e18-goog Subject: [PATCH 4.14 stable v2 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 Lars Persson reported that a label was unused in the previous version of this patchset, so I'm sending a v2 that fixes it. Sorry for the mess/v2. v2 changes: handle overlapping fragments the way it is done upstream. 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/ I had to backport two additional patches into 4.14 to make it work. John Masinter (captwiggum), could you, please, confirm that this patchset fixes TAHI tests? (I'm reasonably certain that it does, as I ran ip_defrag selftest, but given the amount of changes here, another set of completed tests would be nice to have). 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 | 302 +++--------------- net/ipv6/netfilter/nf_conntrack_reasm.c | 279 +++++------------ net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 3 +- net/ipv6/reassembly.c | 364 ++++++---------------- net/openvswitch/conntrack.c | 1 + 10 files changed, 627 insertions(+), 773 deletions(-) create mode 100644 include/net/ipv6_frag.h -- 2.21.0.593.g511ec345e18-goog