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

netfilter: xtables: clean up xt_mac match routine

Browse Source 
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
This commit is contained in:
Jan Engelhardt
2010-03-16 21:09:04 +01:00
parent 7d5f7ed802
commit 1d1c397db9
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
net/netfilter/xt_mac.c
View File

@@ -27,13 +27,15 @@ MODULE_ALIAS("ip6t_mac");
static bool mac_mt(const struct sk_buff *skb, const struct xt_match_param *par) static bool mac_mt(const struct sk_buff *skb, const struct xt_match_param *par)
{ {
const struct xt_mac_info *info = par->matchinfo; const struct xt_mac_info *info = par->matchinfo;
bool ret;
/* Is mac pointer valid? */ if (skb_mac_header(skb) < skb->head)
return skb_mac_header(skb) >= skb->head && return false;
skb_mac_header(skb) + ETH_HLEN <= skb->data if (skb_mac_header(skb) + ETH_HLEN > skb->data)
/* If so, compare... */ return false;
&& ((!compare_ether_addr(eth_hdr(skb)->h_source, info->srcaddr)) ret = compare_ether_addr(eth_hdr(skb)->h_source, info->srcaddr) == 0;
^ info->invert); ret ^= info->invert;
return ret;
} }
static struct xt_match mac_mt_reg __read_mostly = { static struct xt_match mac_mt_reg __read_mostly = {