diff options
| author |   David Ahern <dsahern@gmail.com> | 2019-04-23 18:06:30 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-04-23 21:52:33 -0700 |
| commit | b2f97f7de2f6a4df8e431330cf467576486651c5 (patch) | |
| tree | 65035cf5ac604d66065dd1be2b71c1986f6ccacc /net/ipv6/fib6_rules.c | |
| parent | mlxsw: spectrum_router: Prevent ipv6 gateway with v4 route via replace and append (diff) | |
| download | linux-dev-b2f97f7de2f6a4df8e431330cf467576486651c5.tar.xz linux-dev-b2f97f7de2f6a4df8e431330cf467576486651c5.zip | |
ipv6: fib6_rule_action_alt needs to return -EAGAIN
fib rule actions should return -EAGAIN for the rules to continue to the
next one. A recent change overwrote err with the lookup always returning
0 (future change will make it more like IPv4) which means the rules
stopped at the first (e.g., local table lookup only). Catch and reset err
to -EAGAIN.
Fixes: effda4dd97e87 ("ipv6: Pass fib6_result to fib lookups")
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/ipv6/fib6_rules.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c index ab5ac643bae8..dbedbe655c91 100644 --- a/net/ipv6/fib6_rules.c +++ b/net/ipv6/fib6_rules.c @@ -157,7 +157,7 @@ static int fib6_rule_action_alt(struct fib_rule *rule, struct flowi *flp, struct flowi6 *flp6 = &flp->u.ip6; struct net *net = rule->fr_net; struct fib6_table *table; - int err = -EAGAIN, *oif; + int err, *oif; u32 tb_id; switch (rule->action) { @@ -182,6 +182,8 @@ static int fib6_rule_action_alt(struct fib_rule *rule, struct flowi *flp, if (!err && res->f6i != net->ipv6.fib6_null_entry) err = fib6_rule_saddr(net, rule, flags, flp6, res->nh->fib_nh_dev); + else + err = -EAGAIN; return err; } |