[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20100908.133747.232732909.davem@davemloft.net>
Date: Wed, 08 Sep 2010 13:37:47 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: vladislav.yasevich@...com
Cc: error27@...il.com, sri@...ibm.com, yjwei@...fujitsu.com,
cascardo@...oscopio.com, linux-sctp@...r.kernel.org,
netdev@...r.kernel.org, kernel-janitors@...r.kernel.org
Subject: Re: [patch] sctp: fix test for end of loop
From: Vlad Yasevich <vladislav.yasevich@...com>
Date: Wed, 08 Sep 2010 16:34:46 -0400
> I would ack this.
So why don't you? :-)
sctp: Fix test for end of loop in sctp_sf_check_restart_addrs().
Based upon a patch by Dan Carpenter.
Signed-off-by: David S. Miller <davem@...emloft.net>
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 8b28443..3d5bbae7 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -1241,7 +1241,7 @@ static int sctp_sf_check_restart_addrs(const struct sctp_association *new_asoc,
sctp_cmd_seq_t *commands)
{
struct sctp_transport *new_addr, *addr;
- int found;
+ int ret = 1;
/* Implementor's Guide - Sectin 5.2.2
* ...
@@ -1254,31 +1254,28 @@ static int sctp_sf_check_restart_addrs(const struct sctp_association *new_asoc,
/* Search through all current addresses and make sure
* we aren't adding any new ones.
*/
- new_addr = NULL;
- found = 0;
-
list_for_each_entry(new_addr, &new_asoc->peer.transport_addr_list,
transports) {
- found = 0;
list_for_each_entry(addr, &asoc->peer.transport_addr_list,
transports) {
if (sctp_cmp_addr_exact(&new_addr->ipaddr,
- &addr->ipaddr)) {
- found = 1;
- break;
- }
+ &addr->ipaddr))
+ goto next;
}
- if (!found)
- break;
- }
- /* If a new address was added, ABORT the sender. */
- if (!found && new_addr) {
+ /* 'new_addr' could not be found in the transport address
+ * list of 'asoc', abort.
+ */
sctp_sf_send_restart_abort(&new_addr->ipaddr, init, commands);
+ ret = 0;
+ break;
+
+ next:
+ ;
}
/* Return success if all addresses were found. */
- return found;
+ return ret;
}
/* Populate the verification/tie tags based on overlapping INIT
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists