lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netfilter: xtables: untangle spaghetti if clauses in checkentry

Browse Source 
As I'm changing the return values soon, I want to have a clear visual
path.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
This commit is contained in:
Jan Engelhardt
2010-03-23 17:40:13 +01:00
parent 7911b5c75b
commit 9f56731741
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
net/netfilter/xt_dccp.c
View File

@@ -127,9 +127,13 @@ static bool dccp_mt_check(const struct xt_mtchk_param *par)
{ {
const struct xt_dccp_info *info = par->matchinfo; const struct xt_dccp_info *info = par->matchinfo;
return !(info->flags & ~XT_DCCP_VALID_FLAGS) if (info->flags & ~XT_DCCP_VALID_FLAGS)
&& !(info->invflags & ~XT_DCCP_VALID_FLAGS) return false;
&& !(info->invflags & ~info->flags); if (info->invflags & ~XT_DCCP_VALID_FLAGS)
return false;
if (info->invflags & ~info->flags)
return false;
return true;
} }
static struct xt_match dccp_mt_reg[] __read_mostly = { static struct xt_match dccp_mt_reg[] __read_mostly = {

20
net/netfilter/xt_sctp.c
View File

@@ -148,14 +148,18 @@ static bool sctp_mt_check(const struct xt_mtchk_param *par)
{ {
const struct xt_sctp_info *info = par->matchinfo; const struct xt_sctp_info *info = par->matchinfo;
return !(info->flags & ~XT_SCTP_VALID_FLAGS) if (info->flags & ~XT_SCTP_VALID_FLAGS)
&& !(info->invflags & ~XT_SCTP_VALID_FLAGS) return false;
&& !(info->invflags & ~info->flags) if (info->invflags & ~XT_SCTP_VALID_FLAGS)
&& ((!(info->flags & XT_SCTP_CHUNK_TYPES)) || return false;
(info->chunk_match_type & if (info->invflags & ~info->flags)
(SCTP_CHUNK_MATCH_ALL return false;
| SCTP_CHUNK_MATCH_ANY if (!(info->flags & XT_SCTP_CHUNK_TYPES))
| SCTP_CHUNK_MATCH_ONLY))); return true;
if (info->chunk_match_type & (SCTP_CHUNK_MATCH_ALL |
SCTP_CHUNK_MATCH_ANY | SCTP_CHUNK_MATCH_ONLY))
return true;
return false;
} }
static struct xt_match sctp_mt_reg[] __read_mostly = { static struct xt_match sctp_mt_reg[] __read_mostly = {