hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipv6: Use result arg in fib_lookup_arg consistently

Browse Source 
arg.result is sometimes used as fib6_result and sometimes used to
hold the rt6_info. Add rt6_info to fib6_result and make the use
of arg.result consistent through ipv6 rules.

The rt6 entry is filled in for lookups returning a dst_entry, but not
for direct fib_lookups that just want a fib6_info.

Fixes: effda4dd97 ("ipv6: Pass fib6_result to fib lookups")
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Ahern 2019-04-23 18:05:33 -07:00 committed by David S. Miller
parent b2f97f7de2
commit a65120bae4
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/ip6_fib.h
View File

@ -195,6 +195,7 @@ struct fib6_result {
struct fib6_info *f6i; struct fib6_info *f6i;
u32 fib6_flags; u32 fib6_flags;
u8 fib6_type; u8 fib6_type;
struct rt6_info *rt6;
}; };
#define for_each_fib6_node_rt_rcu(fn) \ #define for_each_fib6_node_rt_rcu(fn) \

15
net/ipv6/fib6_rules.c
View File

@ -94,9 +94,11 @@ struct dst_entry *fib6_rule_lookup(struct net *net, struct flowi6 *fl6,
int flags, pol_lookup_t lookup) int flags, pol_lookup_t lookup)
{ {
if (net->ipv6.fib6_has_custom_rules) { if (net->ipv6.fib6_has_custom_rules) {
struct fib6_result res = {};
struct fib_lookup_arg arg = { struct fib_lookup_arg arg = {
.lookup_ptr = lookup, .lookup_ptr = lookup,
.lookup_data = skb, .lookup_data = skb,
.result = &res,
.flags = FIB_LOOKUP_NOREF, .flags = FIB_LOOKUP_NOREF,
}; };
@ -106,8 +108,8 @@ struct dst_entry *fib6_rule_lookup(struct net *net, struct flowi6 *fl6,
fib_rules_lookup(net->ipv6.fib6_rules_ops, fib_rules_lookup(net->ipv6.fib6_rules_ops,
flowi6_to_flowi(fl6), flags, &arg); flowi6_to_flowi(fl6), flags, &arg);
if (arg.result) if (res.rt6)
return arg.result; return &res.rt6->dst;
} else { } else {
struct rt6_info *rt; struct rt6_info *rt;
@ -191,6 +193,7 @@ static int fib6_rule_action_alt(struct fib_rule *rule, struct flowi *flp,
static int __fib6_rule_action(struct fib_rule *rule, struct flowi *flp, static int __fib6_rule_action(struct fib_rule *rule, struct flowi *flp,
int flags, struct fib_lookup_arg *arg) int flags, struct fib_lookup_arg *arg)
{ {
struct fib6_result *res = arg->result;
struct flowi6 *flp6 = &flp->u.ip6; struct flowi6 *flp6 = &flp->u.ip6;
struct rt6_info *rt = NULL; struct rt6_info *rt = NULL;
struct fib6_table *table; struct fib6_table *table;
@ -245,7 +248,7 @@ again:
discard_pkt: discard_pkt:
dst_hold(&rt->dst); dst_hold(&rt->dst);
out: out:
arg->result = rt; res->rt6 = rt;
return err; return err;
} }
@ -260,9 +263,13 @@ static int fib6_rule_action(struct fib_rule *rule, struct flowi *flp,
static bool fib6_rule_suppress(struct fib_rule *rule, struct fib_lookup_arg *arg) static bool fib6_rule_suppress(struct fib_rule *rule, struct fib_lookup_arg *arg)
{ {
struct rt6_info *rt = (struct rt6_info *) arg->result; struct fib6_result *res = arg->result;
struct rt6_info *rt = res->rt6;
struct net_device *dev = NULL; struct net_device *dev = NULL;
if (!rt)
return false;
if (rt->rt6i_idev) if (rt->rt6i_idev)
dev = rt->rt6i_idev->dev; dev = rt->rt6i_idev->dev;