net: xfrm: drop check of pols[0] for the second time
authorJean Sacren <sakiwit@gmail.com>
Tue, 30 Nov 2021 07:03:12 +0000 (00:03 -0700)
committerSteffen Klassert <steffen.klassert@secunet.com>
Wed, 1 Dec 2021 08:23:01 +0000 (09:23 +0100)
!pols[0] is checked earlier.  If we don't return, pols[0] is always
true.  We should drop the check of pols[0] for the second time and the
binary is also smaller.

Before:
   text    data     bss     dec     hex filename
  48395     957     240   49592    c1b8 net/xfrm/xfrm_policy.o

After:
   text    data     bss     dec     hex filename
  48379     957     240   49576    c1a8 net/xfrm/xfrm_policy.o

Signed-off-by: Jean Sacren <sakiwit@gmail.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
net/xfrm/xfrm_policy.c

index edc673e78114f6bf0891aedff6351d6eb3025130..9341298b2a70ce361882d19447a12eda8964a241 100644 (file)
@@ -2680,7 +2680,7 @@ static int xfrm_expand_policies(const struct flowi *fl, u16 family,
        *num_xfrms = pols[0]->xfrm_nr;
 
 #ifdef CONFIG_XFRM_SUB_POLICY
-       if (pols[0] && pols[0]->action == XFRM_POLICY_ALLOW &&
+       if (pols[0]->action == XFRM_POLICY_ALLOW &&
            pols[0]->type != XFRM_POLICY_TYPE_MAIN) {
                pols[1] = xfrm_policy_lookup_bytype(xp_net(pols[0]),
                                                    XFRM_POLICY_TYPE_MAIN,