diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-09-25 11:19:44 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-09-25 11:19:44 +0200 |
| commit | fb437bc8fe36c964d9bf2f4b568e6c77c235c5e3 (patch) | |
| tree | 7d3a08a88aad2e7541231f0241d97e64df4a4208 /net/ipv6/ip6_output.c | |
| parent | 49e73246cbe6fe0df9cae2db87f31cdc3a0b2b61 (diff) | |
| parent | 6bf4ca7fbc85d80446ac01c0d1d77db4d91a6d84 (diff) | |
| download | talos-op-linux-fb437bc8fe36c964d9bf2f4b568e6c77c235c5e3.tar.gz talos-op-linux-fb437bc8fe36c964d9bf2f4b568e6c77c235c5e3.zip | |
Merge tag 'v4.19-rc5' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/ipv6/ip6_output.c')
| -rw-r--r-- | net/ipv6/ip6_output.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 16f200f06500..f9f8f554d141 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -219,12 +219,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); |
