From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Peter Oskolkov <posk@google.com>,
Eric Dumazet <edumazet@google.com>,
Florian Westphal <fw@strlen.de>,
"David S. Miller" <davem@davemloft.net>,
Mao Wenan <maowenan@huawei.com>
Subject: [PATCH 4.4 60/65] ipv6: defrag: drop non-last frags smaller than min mtu
Date: Mon, 4 Feb 2019 11:36:53 +0100 [thread overview]
Message-ID: <20190204103620.242338314@linuxfoundation.org> (raw)
In-Reply-To: <20190204103610.583715954@linuxfoundation.org>
4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <fw@strlen.de>
commit 0ed4229b08c13c84a3c301a08defdc9e7f4467e6 upstream.
don't bother with pathological cases, they only waste cycles.
IPv6 requires a minimum MTU of 1280 so we should never see fragments
smaller than this (except last frag).
v3: don't use awkward "-offset + len"
v2: drop IPv4 part, which added same check w. IPV4_MIN_MTU (68).
There were concerns that there could be even smaller frags
generated by intermediate nodes, e.g. on radio networks.
Cc: Peter Oskolkov <posk@google.com>
Cc: Eric Dumazet <edumazet@google.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Mao Wenan <maowenan@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
net/ipv6/netfilter/nf_conntrack_reasm.c | 4 ++++
net/ipv6/reassembly.c | 4 ++++
2 files changed, 8 insertions(+)
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -602,6 +602,10 @@ struct sk_buff *nf_ct_frag6_gather(struc
hdr = ipv6_hdr(clone);
fhdr = (struct frag_hdr *)skb_transport_header(clone);
+ if (skb->len - skb_network_offset(skb) < IPV6_MIN_MTU &&
+ fhdr->frag_off & htons(IP6_MF))
+ goto ret_orig;
+
skb_orphan(skb);
fq = fq_find(net, fhdr->identification, user, &hdr->saddr, &hdr->daddr,
skb->dev ? skb->dev->ifindex : 0, ip6_frag_ecn(hdr));
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -549,6 +549,10 @@ static int ipv6_frag_rcv(struct sk_buff
return 1;
}
+ if (skb->len - skb_network_offset(skb) < IPV6_MIN_MTU &&
+ fhdr->frag_off & htons(IP6_MF))
+ goto fail_hdr;
+
fq = fq_find(net, fhdr->identification, &hdr->saddr, &hdr->daddr,
skb->dev ? skb->dev->ifindex : 0, ip6_frag_ecn(hdr));
if (fq) {
next prev parent reply other threads:[~2019-02-04 11:07 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-04 10:35 [PATCH 4.4 00/65] 4.4.173-stable review Greg Kroah-Hartman
2019-02-04 10:35 ` [PATCH 4.4 01/65] net: Fix usage of pskb_trim_rcsum Greg Kroah-Hartman
2019-02-04 10:35 ` [PATCH 4.4 02/65] openvswitch: Avoid OOB read when parsing flow nlattrs Greg Kroah-Hartman
2019-02-04 10:35 ` [PATCH 4.4 03/65] net: ipv4: Fix memory leak in network namespace dismantle Greg Kroah-Hartman
2019-02-04 10:35 ` [PATCH 4.4 04/65] net_sched: refetch skb protocol for each filter Greg Kroah-Hartman
2019-02-04 10:35 ` [PATCH 4.4 05/65] net: bridge: Fix ethernet header pointer before check skb forwardable Greg Kroah-Hartman
2019-02-04 10:35 ` [PATCH 4.4 06/65] mmc: Kconfig: Enable CONFIG_MMC_SDHCI_IO_ACCESSORS Greg Kroah-Hartman
2019-02-04 11:05 ` Georgi Djakov
2019-02-04 11:13 ` Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 07/65] USB: serial: simple: add Motorola Tetra TPG2200 device id Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 08/65] USB: serial: pl2303: add new PID to support PL2303TB Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 09/65] ASoC: atom: fix a missing check of snd_pcm_lib_malloc_pages Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 10/65] ARC: perf: map generic branches to correct hardware condition Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 11/65] s390/early: improve machine detection Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 12/65] s390/smp: fix CPU hotplug deadlock with CPU rescan Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 13/65] char/mwave: fix potential Spectre v1 vulnerability Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 14/65] staging: rtl8188eu: Add device code for D-Link DWA-121 rev B1 Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 15/65] tty: Handle problem if line discipline does not have receive_buf Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 16/65] tty/n_hdlc: fix __might_sleep warning Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 17/65] CIFS: Fix possible hang during async MTU reads and writes Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 18/65] Input: xpad - add support for SteelSeries Stratus Duo Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 19/65] KVM: x86: Fix single-step debugging Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 20/65] x86/kaslr: Fix incorrect i8254 outb() parameters Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 21/65] can: dev: __can_get_echo_skb(): fix bogous check for non-existing skb by removing it Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 22/65] can: bcm: check timer values before ktime conversion Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 23/65] vt: invoke notifier on screen size change Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 24/65] perf unwind: Unwind with libdw doesnt take symfs into account Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 25/65] perf unwind: Take pgoff into account when reporting elf to libdwfl Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 26/65] irqchip/gic-v3-its: Align PCI Multi-MSI allocation on their size Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 27/65] arm64: mm: remove page_mapping check in __sync_icache_dcache Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 28/65] f2fs: read page index before freeing Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 29/65] Revert "loop: Fix double mutex_unlock(&loop_ctl_mutex) in loop_control_ioctl()" Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 30/65] Revert "loop: Get rid of loop_index_mutex" Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 31/65] Revert "loop: Fold __loop_release into loop_release" Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 32/65] s390/smp: Fix calling smp_call_ipl_cpu() from ipl CPU Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 33/65] fs: add the fsnotify call to vfs_iter_write Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 34/65] ipv6: Consider sk_bound_dev_if when binding a socket to an address Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 35/65] l2tp: copy 4 more bytes to linear part if necessary Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 36/65] net/mlx4_core: Add masking for a few queries on HCA caps Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 37/65] netrom: switch to sock timer API Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 38/65] net/rose: fix NULL ax25_cb kernel panic Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 39/65] ucc_geth: Reset BQL queue when stopping device Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 40/65] l2tp: remove l2specific_len dependency in l2tp_core Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 41/65] l2tp: fix reading optional fields of L2TPv3 Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 42/65] CIFS: Do not count -ENODATA as failure for query directory Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 43/65] fs/dcache: Fix incorrect nr_dentry_unused accounting in shrink_dcache_sb() Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 44/65] ARM: cns3xxx: Fix writing to wrong PCI config registers after alignment Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 45/65] arm64: hyp-stub: Forbid kprobing of the hyp-stub Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 46/65] gfs2: Revert "Fix loop in gfs2_rbm_find" Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 47/65] platform/x86: asus-nb-wmi: Map 0x35 to KEY_SCREENLOCK Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 48/65] platform/x86: asus-nb-wmi: Drop mapping of 0x33 and 0x34 scan codes Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 49/65] mmc: sdhci-iproc: handle mmc_of_parse() errors during probe Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 50/65] kernel/exit.c: release ptraced tasks before zap_pid_ns_processes Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 51/65] mm, oom: fix use-after-free in oom_kill_process Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 52/65] cifs: Always resolve hostname before reconnecting Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 53/65] drivers: core: Remove glue dirs from sysfs earlier Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 54/65] mm: migrate: dont rely on __PageMovable() of newpage after unlocking it Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 55/65] fs: dont scan the inode cache before SB_BORN is set Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 56/65] ip: discard IPv4 datagrams with overlapping segments Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 57/65] net: modify skb_rbtree_purge to return the truesize of all purged skbs Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 58/65] inet: frags: get rif of inet_frag_evicting() Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 59/65] ip: use rb trees for IP frag queue Greg Kroah-Hartman
2019-02-04 10:36 ` Greg Kroah-Hartman [this message]
2019-02-04 10:36 ` [PATCH 4.4 61/65] ip: add helpers to process in-order fragments faster Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 62/65] ip: process in-order fragments efficiently Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 63/65] net: ipv4: do not handle duplicate fragments as overlapping Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 64/65] ip: frags: fix crash in ip_do_fragment() Greg Kroah-Hartman
2019-02-04 10:36 ` [PATCH 4.4 65/65] ipv4: frags: precedence bug in ip_expire() Greg Kroah-Hartman
2019-02-04 22:48 ` [PATCH 4.4 00/65] 4.4.173-stable review Guenter Roeck
2019-02-05 14:42 ` Greg Kroah-Hartman
2019-02-05 15:12 ` Guenter Roeck
2019-02-05 6:24 ` Naresh Kamboju
2019-02-05 10:17 ` Jon Hunter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190204103620.242338314@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=fw@strlen.de \
--cc=linux-kernel@vger.kernel.org \
--cc=maowenan@huawei.com \
--cc=posk@google.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).