diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-14 14:38:30 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-14 14:38:30 -0800 |
| commit | 172ad9af55d236cb124d67de7314a90dedb50df1 (patch) | |
| tree | ab225ebb0bcab867305fec87308bda97ca060102 /net/ipv4/ip_input.c | |
| parent | a44007a42dfd8e487537c7b1f8045577b28a4d95 (diff) | |
| parent | 18558cae0272f8fd9647e69d3fec1565a7949865 (diff) | |
Merge 4.5-rc4 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv4/ip_input.c')
| -rw-r--r-- | net/ipv4/ip_input.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c index b1209b63381f..d77eb0c3b684 100644 --- a/net/ipv4/ip_input.c +++ b/net/ipv4/ip_input.c @@ -316,7 +316,10 @@ static int ip_rcv_finish(struct net *net, struct sock *sk, struct sk_buff *skb) const struct iphdr *iph = ip_hdr(skb); struct rtable *rt; - if (sysctl_ip_early_demux && !skb_dst(skb) && !skb->sk) { + if (sysctl_ip_early_demux && + !skb_dst(skb) && + !skb->sk && + !ip_is_fragment(iph)) { const struct net_protocol *ipprot; int protocol = iph->protocol; |