Message ID | 20190906035637.47097-1-zenczykowski@gmail.com |
---|---|
State | Accepted |
Delegated to: | David Miller |
Headers | show |
Series | net-ipv6: addrconf_f6i_alloc - fix non-null pointer check to !IS_ERR() | expand |
On Fri, Sep 6, 2019 at 5:56 AM Maciej Żenczykowski <zenczykowski@gmail.com> wrote: > > From: Maciej Żenczykowski <maze@google.com> > > Fixes a stupid bug I recently introduced... > ip6_route_info_create() returns an ERR_PTR(err) and not a NULL on error. > > Fixes: d55a2e374a94 ("net-ipv6: fix excessive RTF_ADDRCONF flag on ::1/128 local route (and others)'") > Cc: David Ahern <dsahern@gmail.com> > Cc: Lorenzo Colitti <lorenzo@google.com> > Cc: Eric Dumazet <edumazet@google.com> > Signed-off-by: Maciej Żenczykowski <maze@google.com> > --- Reported-by: syzbot <syzkaller@googlegroups.com> Signed-off-by: Eric Dumazet <edumazet@google.com> Thanks.
From: Maciej Żenczykowski <zenczykowski@gmail.com> Date: Thu, 5 Sep 2019 20:56:37 -0700 > From: Maciej Żenczykowski <maze@google.com> > > Fixes a stupid bug I recently introduced... > ip6_route_info_create() returns an ERR_PTR(err) and not a NULL on error. > > Fixes: d55a2e374a94 ("net-ipv6: fix excessive RTF_ADDRCONF flag on ::1/128 local route (and others)'") > Cc: David Ahern <dsahern@gmail.com> > Cc: Lorenzo Colitti <lorenzo@google.com> > Cc: Eric Dumazet <edumazet@google.com> > Signed-off-by: Maciej Żenczykowski <maze@google.com> Applied and queued up for -stable since I queued up the patch this fixes.
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 003562dd3395..2fb2b913214c 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -4383,7 +4383,7 @@ struct fib6_info *addrconf_f6i_alloc(struct net *net, } f6i = ip6_route_info_create(&cfg, gfp_flags, NULL); - if (f6i) + if (!IS_ERR(f6i)) f6i->dst_nocount = true; return f6i; }