net/ipv6: Remove unncessary check on f6i in fib6_check

dsahern · davem330 · commit 8ae869714ba3 · 2018-04-21T16:06:14.000-04:00
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 &lt;dan.carpenter@oracle.com&gt;
Signed-off-by: David Ahern &lt;dsahern@gmail.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
@@ -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))

Original file line number	Diff line number	Diff line change
`@@ -2130,8 +2130,7 @@ static bool fib6_check(struct fib6_info *f6i, u32 cookie)`
`2130`	`2130`	`{`
`2131`	`2131`	`u32 rt_cookie = 0;`
`2132`	`2132`
`2133`		`- if ((f6i && !fib6_get_cookie_safe(f6i, &rt_cookie)) \|\|`
`2134`		`- rt_cookie != cookie)`
	`2133`	`+ if (!fib6_get_cookie_safe(f6i, &rt_cookie) \|\| rt_cookie != cookie)`
`2135`	`2134`	`return false;`
`2136`	`2135`
`2137`	`2136`	`if (fib6_check_expired(f6i))`