From: Andreas Schultz <aschultz@tpip.net>
To: netdev@vger.kernel.org
Cc: Pravin B Shelar <pshelar@nicira.com>,
"David S. Miller" <davem@davemloft.net>
Subject: [PATCH net v3 2/2] tipc: remove invalid ip_rt_put
Date: Thu, 8 Oct 2015 18:08:50 +0200 [thread overview]
Message-ID: <1444320530-28706-2-git-send-email-aschultz@tpip.net> (raw)
In-Reply-To: <1444320530-28706-1-git-send-email-aschultz@tpip.net>
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(-)
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;
--
2.1.4
next prev parent reply other threads:[~2015-10-08 16:08 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-08 16:08 [PATCH net v3 1/2] fix return of iptunnel_xmit Andreas Schultz
2015-10-08 16:08 ` Andreas Schultz [this message]
2015-10-08 16:25 ` [PATCH net v3 2/2] tipc: remove invalid ip_rt_put Jiri Benc
2015-10-08 16:19 ` [PATCH net v3 1/2] fix return of iptunnel_xmit Jiri Benc
2015-10-08 17:33 ` Pravin Shelar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1444320530-28706-2-git-send-email-aschultz@tpip.net \
--to=aschultz@tpip.net \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=pshelar@nicira.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).