diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 13:37:50 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 13:37:50 -0400 |
| commit | fdd57c5524ca42ca9254ef29bf7cdea08c747bac (patch) | |
| tree | 1d9c8a9dad525de6f8bbc27f2d4a71be8bf4717e | |
| parent | 9ad18cd0df530be6d76e55ef368e57159cca3a9c (diff) | |
| download | longterm-queue-4.12-fdd57c5524ca42ca9254ef29bf7cdea08c747bac.tar.gz | |
net: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/ipv4-igmp-guard-against-silly-MTU-values.patch | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/queue/ipv4-igmp-guard-against-silly-MTU-values.patch b/queue/ipv4-igmp-guard-against-silly-MTU-values.patch index 770a7d4..1e46259 100644 --- a/queue/ipv4-igmp-guard-against-silly-MTU-values.patch +++ b/queue/ipv4-igmp-guard-against-silly-MTU-values.patch @@ -1,4 +1,4 @@ -From b5476022bbada3764609368f03329ca287528dc8 Mon Sep 17 00:00:00 2001 +From e0c4214d98d9bb7f9bc95b5ca17f87b7f5708665 Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Mon, 11 Dec 2017 07:17:39 -0800 Subject: [PATCH] ipv4: igmp: guard against silly MTU values @@ -22,9 +22,10 @@ ETH_MIN_MTU anymore. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/net/ip.h b/include/net/ip.h -index 9896f46cbbf1..af8addbaa3c1 100644 +index 0cf7f5a65fe6..482fd79bb49e 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -34,6 +34,7 @@ @@ -36,10 +37,10 @@ index 9896f46cbbf1..af8addbaa3c1 100644 struct sock; diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c -index a4573bccd6da..7a93359fbc72 100644 +index df14815a3b8c..4d13d7a97b2d 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c -@@ -1428,7 +1428,7 @@ skip: +@@ -1387,7 +1387,7 @@ static void inetdev_changename(struct net_device *dev, struct in_device *in_dev) static bool inetdev_valid_mtu(unsigned int mtu) { @@ -49,7 +50,7 @@ index a4573bccd6da..7a93359fbc72 100644 static void inetdev_send_gratuitous_arp(struct net_device *dev, diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c -index d1f8f302dbf3..50448a220a1f 100644 +index abdbe79ee175..ae22f444a795 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@ -404,16 +404,17 @@ static int grec_size(struct ip_mc_list *pmc, int type, int gdel, int sdel) @@ -72,7 +73,7 @@ index d1f8f302dbf3..50448a220a1f 100644 + if (!skb) + return NULL; + } - pgr = skb_put(skb, sizeof(struct igmpv3_grec)); + pgr = (struct igmpv3_grec *)skb_put(skb, sizeof(struct igmpv3_grec)); pgr->grec_type = type; pgr->grec_auxwords = 0; @@ -436,12 +437,17 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ip_mc_list *pmc, @@ -117,7 +118,7 @@ index d1f8f302dbf3..50448a220a1f 100644 first = 0; } if (!skb) -@@ -538,7 +544,7 @@ empty_source: +@@ -538,7 +544,7 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ip_mc_list *pmc, igmpv3_sendpack(skb); skb = NULL; /* add_grhead will get a new one */ } @@ -127,7 +128,7 @@ index d1f8f302dbf3..50448a220a1f 100644 } if (pgr) diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c -index fe6fee728ce4..5ddb1cb52bd4 100644 +index 129d1a3616f8..47768a6003d5 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -349,8 +349,8 @@ static int ip_tunnel_bind_dev(struct net_device *dev) |