a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sctp: fix test for end of loop

Browse Source 
Add a list_has_sctp_addr function to simplify loop

Based on a patches by Dan Carpenter and David Miller

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joe Perches 2010-09-08 11:04:21 +00:00 committed by David S. Miller
parent e199e6136c
commit 123031c0ee
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
net/sctp/sm_statefuns.c
View File

@ -1232,6 +1232,18 @@ out:
return 0; return 0;
} }
static bool list_has_sctp_addr(const struct list_head *list,
union sctp_addr *ipaddr)
{
struct sctp_transport *addr;
list_for_each_entry(addr, list, transports) {
if (sctp_cmp_addr_exact(ipaddr, &addr->ipaddr))
return true;
}
return false;
}
/* A restart is occurring, check to make sure no new addresses /* A restart is occurring, check to make sure no new addresses
* are being added as we may be under a takeover attack. * are being added as we may be under a takeover attack.
*/ */
@ -1240,10 +1252,10 @@ static int sctp_sf_check_restart_addrs(const struct sctp_association *new_asoc,
struct sctp_chunk *init, struct sctp_chunk *init,
sctp_cmd_seq_t *commands) sctp_cmd_seq_t *commands)
{ {
struct sctp_transport *new_addr, *addr; struct sctp_transport *new_addr;
int found; int ret = 1;
/* Implementor's Guide - Sectin 5.2.2 /* Implementor's Guide - Section 5.2.2
* ... * ...
* Before responding the endpoint MUST check to see if the * Before responding the endpoint MUST check to see if the
* unexpected INIT adds new addresses to the association. If new * unexpected INIT adds new addresses to the association. If new
@ -1254,31 +1266,19 @@ static int sctp_sf_check_restart_addrs(const struct sctp_association *new_asoc,
/* Search through all current addresses and make sure /* Search through all current addresses and make sure
* we aren't adding any new ones. * we aren't adding any new ones.
*/ */
new_addr = NULL;
found = 0;
list_for_each_entry(new_addr, &new_asoc->peer.transport_addr_list, list_for_each_entry(new_addr, &new_asoc->peer.transport_addr_list,
transports) { transports) {
found = 0; if (!list_has_sctp_addr(&asoc->peer.transport_addr_list,
list_for_each_entry(addr, &asoc->peer.transport_addr_list, &new_addr->ipaddr)) {
transports) { sctp_sf_send_restart_abort(&new_addr->ipaddr, init,
if (sctp_cmp_addr_exact(&new_addr->ipaddr, commands);
&addr->ipaddr)) { ret = 0;
found = 1;
break;
}
}
if (!found)
break; break;
} }
/* If a new address was added, ABORT the sender. */
if (!found && new_addr) {
sctp_sf_send_restart_abort(&new_addr->ipaddr, init, commands);
} }
/* Return success if all addresses were found. */ /* Return success if all addresses were found. */
return found; return ret;
} }
/* Populate the verification/tie tags based on overlapping INIT /* Populate the verification/tie tags based on overlapping INIT