diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 13:40:46 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 13:40:46 -0400 |
| commit | 2aca4bbaceded6d7897a6a747d7e6861bb8437ce (patch) | |
| tree | 85613784d46987b81ce397bd2647aaa4ab7c6f9a | |
| parent | fdd57c5524ca42ca9254ef29bf7cdea08c747bac (diff) | |
| download | longterm-queue-4.12-2aca4bbaceded6d7897a6a747d7e6861bb8437ce.tar.gz | |
net: another ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/ipv6-mcast-better-catch-silly-mtu-values.patch | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/queue/ipv6-mcast-better-catch-silly-mtu-values.patch b/queue/ipv6-mcast-better-catch-silly-mtu-values.patch index 6657064..826fcdb 100644 --- a/queue/ipv6-mcast-better-catch-silly-mtu-values.patch +++ b/queue/ipv6-mcast-better-catch-silly-mtu-values.patch @@ -1,4 +1,4 @@ -From b9b312a7a451e9c098921856e7cfbc201120e1a7 Mon Sep 17 00:00:00 2001 +From c97aaf15bf41f60319aea099547fd63f0497348c Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Mon, 11 Dec 2017 07:03:38 -0800 Subject: [PATCH] ipv6: mcast: better catch silly mtu values @@ -65,9 +65,10 @@ Signed-off-by: Eric Dumazet <edumazet@google.com> Reported-by: syzbot <syzkaller@googlegroups.com> Tested-by: Xin Long <lucien.xin@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c -index fc6d7d143f2c..844642682b83 100644 +index 07403fa164e1..28af397bf0f7 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c @@ -1682,16 +1682,16 @@ static int grec_size(struct ifmcaddr6 *pmc, int type, int gdel, int sdel) @@ -90,7 +91,7 @@ index fc6d7d143f2c..844642682b83 100644 + if (!skb) + return NULL; + } - pgr = skb_put(skb, sizeof(struct mld2_grec)); + pgr = (struct mld2_grec *)skb_put(skb, sizeof(struct mld2_grec)); pgr->grec_type = type; pgr->grec_auxwords = 0; @@ -1714,10 +1714,15 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ifmcaddr6 *pmc, @@ -133,7 +134,7 @@ index fc6d7d143f2c..844642682b83 100644 first = 0; } if (!skb) -@@ -1814,7 +1819,7 @@ empty_source: +@@ -1814,7 +1819,7 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ifmcaddr6 *pmc, mld_sendpack(skb); skb = NULL; /* add_grhead will get a new one */ } |