diff mbox

[net,v3,2/2] tipc: remove invalid ip_rt_put

Message ID 1444320530-28706-2-git-send-email-aschultz@tpip.net
State Superseded, archived
Delegated to: David Miller
Headers show

Commit Message

Andreas Schultz Oct. 8, 2015, 4:08 p.m. UTC
udp_tunnel_xmit_skb() will free the skb and release the rt->dst
reference in the error case. There is no need (and it would actully
trigger a warning) when we did.
This problem was not visible before, as udp_tunnel_xmit_skb() would
never return a value < 0
---
 net/tipc/udp_media.c | 4 ----
 1 file changed, 4 deletions(-)

Comments

Jiri Benc Oct. 8, 2015, 4:25 p.m. UTC | #1
On Thu,  8 Oct 2015 18:08:50 +0200, Andreas Schultz wrote:
> udp_tunnel_xmit_skb() will free the skb and release the rt->dst
> reference in the error case. There is no need (and it would actully
> trigger a warning) when we did.
> This problem was not visible before, as udp_tunnel_xmit_skb() would
> never return a value < 0

You're missing s-o-b.

> ---
>  net/tipc/udp_media.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c
> index c170d31..de8e110 100644
> --- a/net/tipc/udp_media.c
> +++ b/net/tipc/udp_media.c
> @@ -181,10 +181,6 @@ static int tipc_udp_send_msg(struct net *net, struct sk_buff *skb,
>  					  dst->ipv4.s_addr, 0, ttl, 0,
>  					  src->udp_port, dst->udp_port,
>  					  false, true);
> -		if (err < 0) {
> -			ip_rt_put(rt);
> -			goto tx_error;
> -		}
>  #if IS_ENABLED(CONFIG_IPV6)
>  	} else {
>  		struct dst_entry *ndst;

Not sure what the intended return value of struct tipc_media->send_msg
is but it seems to be completely ignored anyway.

Acked-by: Jiri Benc <jbenc@redhat.com>
diff mbox

Patch

diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c
index c170d31..de8e110 100644
--- a/net/tipc/udp_media.c
+++ b/net/tipc/udp_media.c
@@ -181,10 +181,6 @@  static int tipc_udp_send_msg(struct net *net, struct sk_buff *skb,
 					  dst->ipv4.s_addr, 0, ttl, 0,
 					  src->udp_port, dst->udp_port,
 					  false, true);
-		if (err < 0) {
-			ip_rt_put(rt);
-			goto tx_error;
-		}
 #if IS_ENABLED(CONFIG_IPV6)
 	} else {
 		struct dst_entry *ndst;