OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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: 52900d2228 ("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>
This commit is contained in:
Willem de Bruijn 2018-12-08 06:22:46 -05:00 committed by David S. Miller
parent 83af01ba1c
commit 97ef7b4c55
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/ipv4/ip_output.c
View File

@ -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);

3
net/ipv6/ip6_output.c
View File

@ -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);