fix return of iptunnel_xmit
Subsystems (3)
PATCH v2 1/1 fix return of iptunnel_xmit
All users of iptunnel_xmit expect the return value to be the error code from ip_output_local, but currently the return value is length of the send data on success or zero on error.
Change iptunnel_xmit returns to match the callers expectation.
This bug was introduced when the ip_tunnel_core code was refactored.
---
Change in v2:
- remove unused variable pkt_len
--- net/ipv4/ip_tunnel_core.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
net/ipv4/ip_tunnel_core.c +1 -6
@@ -52,9 +52,7 @@ int iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb, __be32 src, __be32 dst, __u8 proto, __u8 tos, __u8 ttl, __be16 df, bool xnet) { - int pkt_len = skb->len - skb_inner_network_offset(skb); struct iphdr *iph; -int err;skb_scrub_packet (skb, xnet);
@@ -79,10 +77,7 @@ int iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb,__ip_select_ident (dev_net (rt->dst.dev), iph,skb_shinfo (skb)->gso_segs ?:1 ); - err =ip_local_out_sk (sk, skb); -if (unlikely (net_xmit_eval (err))) - pkt_len =0 ; -return pkt_len; +return ip_local_out_sk (sk, skb); }EXPORT_SYMBOL_GPL (iptunnel_xmit);
Signature · 1 line
2.1.4
Quoted 4 lines · Andreas Schultz
All users of
iptunnel_xmitexpect the return value to be the error code fromip_output_local, but currently the return value is length of the send data on success or zero on error.
Changeiptunnel_xmitreturns to match the callers expectation.
That's not true. All users pass the returned value to iptunnel_xmit_stats() where it is used to increase tx_bytes.
The only exception is tipc_udp_send_msg which should be fixed instead.
Jiri
Signature · 1 line
Jiri Benc
Quoted 8 lines · Jiri Benc
Quoted 4 lines · Andreas Schultz
All users of
iptunnel_xmitexpect the return value to be the error code fromip_output_local, but currently the return value is length of the send data on success or zero on error.
Changeiptunnel_xmitreturns to match the callers expectation.That's not true. All users pass the returned value to
iptunnel_xmit_stats()where it is used to increasetx_bytes.
Yes, but iptunnel_xmit_stats() basically has three different counters:
1. count packets and bytes when err > 0
2. count tx_errors when err < 0
3. count tx_dropped when err == 0
Case 2 got lost in cset 0e6fbc5b6c6218987c93b8c7ca60cf786062899d, since the return value of iptunnel_xmit() can only be >= 0.
I tried to find out if ip_local_out_sk() can ever return a negative value. If it can't then iptunnel_xmit_stats() could be simplified and tipc_udp_send_msg should be fixed.
I've reread my change, and it I do have messed up the non-error case. pkt_len should be returned when ip_local_out_sk returns NET_XMIT_SUCCESS or NET_XMIT_CN, 0 when err > 0 and err when err < 0.
Like this:
net/ipv4/ip_tunnel_core.c +6 -3
@@ -80,9 +80,12 @@ int iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb, skb_shinfo(skb)->gso_segs ?: 1); err =ip_local_out_sk (sk, skb); -if (unlikely (net_xmit_eval (err))) - pkt_len =0 ; -return pkt_len; +if (likely (net_xmit_eval (err) ==0 )) +return pkt_len; +if (err <0 ) +return err; + +return 0 ; }EXPORT_SYMBOL_GPL (iptunnel_xmit);
Andreas
Quoted 5 lines
The only exception is
tipc_udp_send_msgwhich should be fixed instead.Jiri
Quoted 6 lines · Andreas Schultz
net/ipv4/ip_tunnel_core.c +0
-0@@ -80,9 +80,12 @@ int iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb, skb_shinfo(skb)->gso_segs ?: 1); err =ip_local_out_sk (sk, skb);
net/ipv4/ip_tunnel_core.c int iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb, · line 89
Quoted 10 lines
net/ipv4/ip_tunnel_core.c +6
-3-if (unlikely (net_xmit_eval (err))) - pkt_len =0 ; -return pkt_len; +if (likely (net_xmit_eval (err) ==0 )) +return pkt_len; +if (err <0 ) +return err; + +return 0 ; }
That looks better :-)
Thanks,
Jiri
Signature · 1 line
Jiri Benc