From: Wang Weidong <wangweidong1@huawei.com>
To: Neil Horman <nhorman@tuxdriver.com>,
Vlad Yasevich <vyasevich@gmail.com>,
David Miller <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>
Subject: [PATCH net-next] sctp: check dst 'NULL' before use it in, sctp_packet_transmit
Date: Wed, 25 Dec 2013 15:47:46 +0800 [thread overview]
Message-ID: <52BA8DA2.6030405@huawei.com> (raw)
skb_dst_set will use dst, if dst is NULL although is not a problem,
then goto the no_route and free nskb, so do the skb_dst_set is pointless.
so check dst before use it. Remove the unnecessary initialization as well.
Signed-off-by: Wang Weidong <wangweidong1@huawei.com>
---
net/sctp/output.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/sctp/output.c b/net/sctp/output.c
index 3be70a4..9b76d62 100644
--- a/net/sctp/output.c
+++ b/net/sctp/output.c
@@ -387,7 +387,7 @@ int sctp_packet_transmit(struct sctp_packet *packet)
int err = 0;
int padding; /* How much padding do we need? */
__u8 has_data = 0;
- struct dst_entry *dst = tp->dst;
+ struct dst_entry *dst;
unsigned char *auth = NULL; /* pointer to auth in skb data */
pr_debug("%s: packet:%p\n", __func__, packet);
@@ -420,9 +420,9 @@ int sctp_packet_transmit(struct sctp_packet *packet)
}
}
dst = dst_clone(tp->dst);
- skb_dst_set(nskb, dst);
if (!dst)
goto no_route;
+ skb_dst_set(nskb, dst);
/* Build the SCTP header. */
sh = (struct sctphdr *)skb_push(nskb, sizeof(struct sctphdr));
--
1.7.12
next reply other threads:[~2013-12-25 7:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-25 7:47 Wang Weidong [this message]
2013-12-25 10:24 ` [PATCH net-next] sctp: check dst 'NULL' before use it in, sctp_packet_transmit Daniel Borkmann
2013-12-25 10:25 ` Daniel Borkmann
2013-12-25 12:25 ` Wang Weidong
2013-12-26 5:55 ` [PATCH net-next v2] sctp: move skb_dst_set() a bit downwards in sctp_packet_transmit() Wang Weidong
2014-01-02 14:58 ` Neil Horman
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=52BA8DA2.6030405@huawei.com \
--to=wangweidong1@huawei.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
--cc=vyasevich@gmail.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).