adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

nf/dccp: merge errorpaths

Browse source 
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ilpo Järvinen 2008-12-14 23:19:02 -08:00 committed by David S. Miller
parent e780f1c33d
commit 79f55f11a0
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
net/netfilter/xt_dccp.c
View file

@ -45,10 +45,8 @@ dccp_find_option(u_int8_t option,
unsigned int optlen = dh->dccph_doff*4 - __dccp_hdr_len(dh); unsigned int optlen = dh->dccph_doff*4 - __dccp_hdr_len(dh);
unsigned int i; unsigned int i;
if (dh->dccph_doff * 4 < __dccp_hdr_len(dh)) { if (dh->dccph_doff * 4 < __dccp_hdr_len(dh))
*hotdrop = true; goto invalid;
return false;
}
if (!optlen) if (!optlen)
return false; return false;
@ -57,9 +55,7 @@ dccp_find_option(u_int8_t option,
op = skb_header_pointer(skb, protoff + optoff, optlen, dccp_optbuf); op = skb_header_pointer(skb, protoff + optoff, optlen, dccp_optbuf);
if (op == NULL) { if (op == NULL) {
/* If we don't have the whole header, drop packet. */ /* If we don't have the whole header, drop packet. */
spin_unlock_bh(&dccp_buflock); goto partial;
*hotdrop = true;
return false;
} }
for (i = 0; i < optlen; ) { for (i = 0; i < optlen; ) {
@ -76,6 +72,12 @@ dccp_find_option(u_int8_t option,
spin_unlock_bh(&dccp_buflock); spin_unlock_bh(&dccp_buflock);
return false; return false;
partial:
spin_unlock_bh(&dccp_buflock);
invalid:
*hotdrop = true;
return false;
} }