aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorWillem de Bruijn <willemb@google.com>2018-12-08 06:22:46 -0500
committerDavid S. Miller <davem@davemloft.net>2018-12-08 12:26:20 -0800
commit97ef7b4c5501b081c6144a08bba6d87baf69b6e5 (patch)
tree0162a188876cd854112e5416d63f79c95721bd46 /net
parentMerge branch 'tc-testing-next' (diff)
downloadlinux-dev-97ef7b4c5501b081c6144a08bba6d87baf69b6e5.tar.xz
linux-dev-97ef7b4c5501b081c6144a08bba6d87baf69b6e5.zip
ip: silence udp zerocopy smatch false positive
extra_uref is used in __ip(6)_append_data only if uarg is set. Smatch sees that the variable is passed to sock_zerocopy_put_abort. This function accesses it only when uarg is set, but smatch cannot infer this. Make this dependency explicit. Fixes: 52900d22288e ("udp: elide zerocopy operation in hot path") Signed-off-by: Willem de Bruijn <willemb@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/ip_output.c3
-rw-r--r--net/ipv6/ip6_output.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 78f028bdad30..ab6618036afe 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1130,7 +1130,8 @@ alloc_new_skb:
error_efault:
err = -EFAULT;
error:
- sock_zerocopy_put_abort(uarg, extra_uref);
+ if (uarg)
+ sock_zerocopy_put_abort(uarg, extra_uref);
cork->length -= length;
IP_INC_STATS(sock_net(sk), IPSTATS_MIB_OUTDISCARDS);
refcount_add(wmem_alloc_delta, &sk->sk_wmem_alloc);
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 6592a39e5ec1..be25b34dc5c2 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1575,7 +1575,8 @@ alloc_new_skb:
error_efault:
err = -EFAULT;
error:
- sock_zerocopy_put_abort(uarg, extra_uref);
+ if (uarg)
+ sock_zerocopy_put_abort(uarg, extra_uref);
cork->length -= length;
IP6_INC_STATS(sock_net(sk), rt->rt6i_idev, IPSTATS_MIB_OUTDISCARDS);
refcount_add(wmem_alloc_delta, &sk->sk_wmem_alloc);