From patchwork Wed Mar 6 14:52:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1052373 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44DxZ652Byz9s9T; Thu, 7 Mar 2019 01:52:30 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1h1XuD-0002Mb-VW; Wed, 06 Mar 2019 14:52:25 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1h1XuB-0002MV-U1 for kernel-team@lists.ubuntu.com; Wed, 06 Mar 2019 14:52:23 +0000 Received: from mail-ed1-f70.google.com ([209.85.208.70]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1h1XuB-0000AW-ND for kernel-team@lists.ubuntu.com; Wed, 06 Mar 2019 14:52:23 +0000 Received: by mail-ed1-f70.google.com with SMTP id f2so6372867edm.18 for ; Wed, 06 Mar 2019 06:52:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=pBGKNMxRVdUw2CoiBK9x+K3PtREEorYvaaOgnkN9cf0=; b=EAf1uakQ26QCSDolNwMz3G9nwwhKtxzI89NOkGqwTcaw5Ue6rkrY1VSxmfqecrOlPP APYCeJOaoreWBh9vBYnl/5tT/tMkKMsAnUSDJG7bElcg2tcYKN6kg5yMXlV0J+veRC2z dml4T+WR/c+LOK08Br95yGcyT8+fAjbG9BmM5v5MbzRg7e0c+wHE8vDteu4Hk5R8Xqrg viovB0BJng5aCZMY+nL8HwBGwalBLD7Y7RA4ieO7tcU4u4pmwXm39LdRTb5s0DqhB78H sQzK8zDbGq67lTeK4MQPy7bRm6AJcVaXVcUm5beAjr5iysM+dxbps0d8nds8SUSCrH9q Tiug== X-Gm-Message-State: APjAAAWLVo4dDqSfbCyYfmxUpTaifAwKpw714ckEqeDjTwoJHX1E8W8V YXIrlNyMjdB3YPyHX5zC7rQxBpjq2Bz7eTA2ZMLHEebuGs0/oCIg95/ZorTwnWXYMsXyHeVWn76 ixOPBLNjZVsEENg/wTn3ZfO0jlDyllaOQ0HN02GP3dQ== X-Received: by 2002:a50:b6e6:: with SMTP id f35mr24139489ede.94.1551883943138; Wed, 06 Mar 2019 06:52:23 -0800 (PST) X-Google-Smtp-Source: APXvYqyVzcAiNDhcWFX1VS5xLJqwqzXVYKGZUldB4AzGn4Id92JoUo7doiKC2H1FEFtrZ8AnNgtkgA== X-Received: by 2002:a50:b6e6:: with SMTP id f35mr24139473ede.94.1551883942844; Wed, 06 Mar 2019 06:52:22 -0800 (PST) Received: from localhost.localdomain ([81.221.192.120]) by smtp.gmail.com with ESMTPSA id e53sm507023ede.26.2019.03.06.06.52.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Mar 2019 06:52:22 -0800 (PST) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][Xenial][PULL] Xenial update: 4.4.174 upstream stable release (LP: #1818806) Date: Wed, 6 Mar 2019 15:52:20 +0100 Message-Id: <20190306145220.16866-1-juergh@canonical.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" SRU Justification Impact: The upstream process for stable tree updates is quite similar in scope to the Ubuntu SRU process, e.g., each patch has to demonstrably fix a bug, and each patch is vetted by upstream by originating either directly from a mainline/stable Linux tree or a minimally backported form of that patch. The following upstream stable patches should be included in the Ubuntu kernel: 4.4.174 upstream stable release from git://git.kernel.org/ Linux 4.4.174 rcu: Force boolean subscript for expedited stall warnings net: ipv4: do not handle duplicate fragments as overlapping net: fix pskb_trim_rcsum_slow() with odd trim offset inet: frags: better deal with smp races ipv4: frags: precedence bug in ip_expire() ip: frags: fix crash in ip_do_fragment() ip: process in-order fragments efficiently ip: add helpers to process in-order fragments faster. ip: use rb trees for IP frag queue. net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends ipv6: defrag: drop non-last frags smaller than min mtu net: modify skb_rbtree_purge to return the truesize of all purged skbs. ip: discard IPv4 datagrams with overlapping segments. inet: frags: fix ip6frag_low_thresh boundary inet: frags: get rid of ipfrag_skb_cb/FRAG_CB inet: frags: reorganize struct netns_frags rhashtable: reorganize struct rhashtable layout ipv6: frags: rewrite ip6_expire_frag_queue() inet: frags: do not clone skb in ip_expire() inet: frags: break the 2GB limit for frags storage inet: frags: remove inet_frag_maybe_warn_overflow() inet: frags: get rif of inet_frag_evicting() inet: frags: remove some helpers ipfrag: really prevent allocation on netns exit net: ieee802154: 6lowpan: fix frag reassembly inet: frags: use rhashtables for reassembly units rhashtable: add schedule points rhashtable: Add rhashtable_lookup() rhashtable: add rhashtable_lookup_get_insert_key() inet: frags: refactor lowpan_net_frag_init() inet: frags: refactor ipv6_frag_init() inet: frags: refactor ipfrag_init() inet: frags: add a pointer to struct netns_frags inet: frags: change inet_frags_init_net() return value Compile-tested all supported architectures. Signed-off-by: Juerg Haefliger --- The following changes since commit b15aacb1714cc936270e2ccd6e0bf4cd0b769367: Linux 4.4.173 (2019-03-06 11:00:17 +0100) are available in the Git repository at: git://git.launchpad.net/~juergh/+git/xenial-linux update-4.4.174 for you to fetch changes up to 89ac5ced2510364c3840e9191f4ccbd7d3a44903: Linux 4.4.174 (2019-03-06 11:30:21 +0100) ---------------------------------------------------------------- Alexander Aring (1): net: ieee802154: 6lowpan: fix frag reassembly Ben Hutchings (1): rhashtable: Add rhashtable_lookup() Dan Carpenter (1): ipv4: frags: precedence bug in ip_expire() Dimitris Michailidis (1): net: fix pskb_trim_rcsum_slow() with odd trim offset Eric Dumazet (19): inet: frags: change inet_frags_init_net() return value inet: frags: add a pointer to struct netns_frags inet: frags: refactor ipfrag_init() inet: frags: refactor ipv6_frag_init() inet: frags: refactor lowpan_net_frag_init() rhashtable: add schedule points inet: frags: use rhashtables for reassembly units inet: frags: remove some helpers inet: frags: get rif of inet_frag_evicting() inet: frags: remove inet_frag_maybe_warn_overflow() inet: frags: break the 2GB limit for frags storage inet: frags: do not clone skb in ip_expire() ipv6: frags: rewrite ip6_expire_frag_queue() rhashtable: reorganize struct rhashtable layout inet: frags: reorganize struct netns_frags inet: frags: get rid of ipfrag_skb_cb/FRAG_CB inet: frags: fix ip6frag_low_thresh boundary net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends inet: frags: better deal with smp races Florian Westphal (1): ipv6: defrag: drop non-last frags smaller than min mtu Greg Kroah-Hartman (1): Linux 4.4.174 Michal Kubecek (1): net: ipv4: do not handle duplicate fragments as overlapping Pablo Neira Ayuso (1): rhashtable: add rhashtable_lookup_get_insert_key() Paolo Abeni (1): ipfrag: really prevent allocation on netns exit Paul E. McKenney (1): rcu: Force boolean subscript for expedited stall warnings Peter Oskolkov (5): ip: discard IPv4 datagrams with overlapping segments. net: modify skb_rbtree_purge to return the truesize of all purged skbs. ip: use rb trees for IP frag queue. ip: add helpers to process in-order fragments faster. ip: process in-order fragments efficiently Taehee Yoo (1): ip: frags: fix crash in ip_do_fragment() Documentation/networking/ip-sysctl.txt | 13 +- Makefile | 2 +- include/linux/rhashtable.h | 143 ++++++-- include/linux/skbuff.h | 16 +- include/net/inet_frag.h | 133 ++++---- include/net/ip.h | 1 - include/net/ipv6.h | 26 +- include/uapi/linux/snmp.h | 1 + kernel/rcu/tree.c | 2 +- lib/rhashtable.c | 15 +- net/core/skbuff.c | 21 +- net/ieee802154/6lowpan/6lowpan_i.h | 26 +- net/ieee802154/6lowpan/reassembly.c | 148 ++++----- net/ipv4/inet_fragment.c | 389 +++++----------------- net/ipv4/ip_fragment.c | 571 ++++++++++++++++++-------------- net/ipv4/proc.c | 7 +- net/ipv6/netfilter/nf_conntrack_reasm.c | 100 +++--- net/ipv6/proc.c | 5 +- net/ipv6/reassembly.c | 209 ++++++------ 19 files changed, 867 insertions(+), 961 deletions(-)