]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
net/ipv6: Remove unncessary check on f6i in fib6_check
authorDavid Ahern <dsahern@gmail.com>
Fri, 20 Apr 2018 22:38:03 +0000 (15:38 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 21 Apr 2018 20:06:14 +0000 (16:06 -0400)
Dan reported an imbalance in fib6_check on use of f6i and checking
whether it is null. Since fib6_check is only called if f6i is non-null,
remove the unnecessary check.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/route.c

index 004d00fe2fe5e04189a654b539913854aa437505..0407bbc5a028be646cbbdab861489fa0314400db 100644 (file)
@@ -2130,8 +2130,7 @@ static bool fib6_check(struct fib6_info *f6i, u32 cookie)
 {
        u32 rt_cookie = 0;
 
-       if ((f6i && !fib6_get_cookie_safe(f6i, &rt_cookie)) ||
-            rt_cookie != cookie)
+       if (!fib6_get_cookie_safe(f6i, &rt_cookie) || rt_cookie != cookie)
                return false;
 
        if (fib6_check_expired(f6i))