iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

Browse Source 
Pablo Neira Ayuso says:

====================
If time allows, please consider pulling the following patchset contains two
late Netfilter fixes, they are:

* Skip broadcast/multicast locally generated traffic in the rpfilter,
  (closes netfilter bugzilla #814), from Florian Westphal.

* Fix missing elements in the listing of ipset bitmap ip,mac set
  type with timeout support enabled, from Jozsef Kadlecsik.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2013-04-19 14:24:47 -04:00
commit fd7fc25328
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/ipv4/netfilter/ipt_rpfilter.c
View File

@ -66,6 +66,12 @@ static bool rpfilter_lookup_reverse(struct flowi4 *fl4,
return dev_match; return dev_match;
} }
static bool rpfilter_is_local(const struct sk_buff *skb)
{
const struct rtable *rt = skb_rtable(skb);
return rt && (rt->rt_flags & RTCF_LOCAL);
}
static bool rpfilter_mt(const struct sk_buff *skb, struct xt_action_param *par) static bool rpfilter_mt(const struct sk_buff *skb, struct xt_action_param *par)
{ {
const struct xt_rpfilter_info *info; const struct xt_rpfilter_info *info;
@ -76,7 +82,7 @@ static bool rpfilter_mt(const struct sk_buff *skb, struct xt_action_param *par)
info = par->matchinfo; info = par->matchinfo;
invert = info->flags & XT_RPFILTER_INVERT; invert = info->flags & XT_RPFILTER_INVERT;
if (par->in->flags & IFF_LOOPBACK) if (rpfilter_is_local(skb))
return true ^ invert; return true ^ invert;
iph = ip_hdr(skb); iph = ip_hdr(skb);

8
net/ipv6/netfilter/ip6t_rpfilter.c
View File

@ -71,6 +71,12 @@ static bool rpfilter_lookup_reverse6(const struct sk_buff *skb,
return ret; return ret;
} }
static bool rpfilter_is_local(const struct sk_buff *skb)
{
const struct rt6_info *rt = (const void *) skb_dst(skb);
return rt && (rt->rt6i_flags & RTF_LOCAL);
}
static bool rpfilter_mt(const struct sk_buff *skb, struct xt_action_param *par) static bool rpfilter_mt(const struct sk_buff *skb, struct xt_action_param *par)
{ {
const struct xt_rpfilter_info *info = par->matchinfo; const struct xt_rpfilter_info *info = par->matchinfo;
@ -78,7 +84,7 @@ static bool rpfilter_mt(const struct sk_buff *skb, struct xt_action_param *par)
struct ipv6hdr *iph; struct ipv6hdr *iph;
bool invert = info->flags & XT_RPFILTER_INVERT; bool invert = info->flags & XT_RPFILTER_INVERT;
if (par->in->flags & IFF_LOOPBACK) if (rpfilter_is_local(skb))
return true ^ invert; return true ^ invert;
iph = ipv6_hdr(skb); iph = ipv6_hdr(skb);

6
net/netfilter/ipset/ip_set_bitmap_ipmac.c
View File

@ -339,7 +339,11 @@ bitmap_ipmac_tlist(const struct ip_set *set,
nla_put_failure: nla_put_failure:
nla_nest_cancel(skb, nested); nla_nest_cancel(skb, nested);
ipset_nest_end(skb, atd); ipset_nest_end(skb, atd);
return -EMSGSIZE; if (unlikely(id == first)) {
cb->args[2] = 0;
return -EMSGSIZE;
}
return 0;
} }
static int static int