On Tue, Mar 22, 2016 at 11:29 AM, David Ahern <d...@cumulusnetworks.com> wrote: > On 3/22/16 9:31 AM, Lance Richardson wrote: >> >> Field fl4.flowi4_flags is not initialized in fib_compute_spec_dst() >> before calling fib_lookup(), which means fib_table_lookup() is >> using non-deterministic data at this line: >> >> if (!(flp->flowi4_flags & FLOWI_FLAG_SKIP_NH_OIF)) { >> >> Fix by initializing fl4.flowi4_flags to zero. >> >> Signed-off-by: Lance Richardson <lrich...@redhat.com> >> --- >> net/ipv4/fib_frontend.c | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c >> index 21add55..896844a 100644 >> --- a/net/ipv4/fib_frontend.c >> +++ b/net/ipv4/fib_frontend.c >> @@ -304,6 +304,7 @@ __be32 fib_compute_spec_dst(struct sk_buff *skb) >> fl4.flowi4_scope = scope; >> fl4.flowi4_mark = IN_DEV_SRC_VMARK(in_dev) ? skb->mark : >> 0; >> fl4.flowi4_tun_key.tun_id = 0; >> + fl4.flowi4_flags = 0; >> if (!fib_lookup(net, &fl4, &res, 0)) >> return FIB_RES_PREFSRC(net, res); >> } else { >> > > Fixes: 58189ca7b2741 ("net: Fix vti use case with oif in dst lookups")
Why does this patch fix this commit? Even before this commit, flowi4_flags was already tested for other bit: @@ -1426,7 +1426,7 @@ int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp, nh->nh_flags & RTNH_F_LINKDOWN && !(fib_flags & FIB_LOOKUP_IGNORE_LINKSTATE)) continue; - if (!(flp->flowi4_flags & FLOWI_FLAG_VRFSRC)) { + if (!(flp->flowi4_flags & FLOWI_FLAG_SKIP_NH_OIF)) { if (flp->flowi4_oif && flp->flowi4_oif != nh->nh_oif) continue; For me, it looks the bug was introduce by commit 35ebf65e851c6d9731abc6362b1.