aboutsummaryrefslogtreecommitdiff
path: root/net/ipv6/ip6_output.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-12-21 09:57:36 +0000
committerMark Brown <broonie@kernel.org>2018-12-21 09:57:36 +0000
commit43603a35574c2e594f9e10a97a40874d1282dd7e (patch)
treea814e05e3d87e221339e4fc9b5e2bd202faee716 /net/ipv6/ip6_output.c
parent38f53ef7bce9f848946a2ad4874d715186e32144 (diff)
parent1b2dbf3c8689071ab54298f1f999f092bb0b2410 (diff)
downloadlinux-linaro-stable-43603a35574c2e594f9e10a97a40874d1282dd7e.tar.gz
Merge tag 'v4.9.145-rt124' into linux-linaro-lsk-v4.9-rt
Linux 4.9.145-rt124
Diffstat (limited to 'net/ipv6/ip6_output.c')
-rw-r--r--net/ipv6/ip6_output.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index ea14466cdca8..8e77cecd2165 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -201,12 +201,10 @@ int ip6_xmit(const struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6,
kfree_skb(skb);
return -ENOBUFS;
}
+ if (skb->sk)
+ skb_set_owner_w(skb2, skb->sk);
consume_skb(skb);
skb = skb2;
- /* skb_set_owner_w() changes sk->sk_wmem_alloc atomically,
- * it is safe to call in our context (socket lock not held)
- */
- skb_set_owner_w(skb, (struct sock *)sk);
}
if (opt->opt_flen)
ipv6_push_frag_opts(skb, opt, &proto);