netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Steffen Klassert <steffen.klassert@secunet.com>
To: David Miller <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
	Steffen Klassert <steffen.klassert@secunet.com>,
	<netdev@vger.kernel.org>
Subject: [PATCH 3/7] net: xfrm: drop check of pols[0] for the second time
Date: Thu, 6 Jan 2022 10:13:46 +0100	[thread overview]
Message-ID: <20220106091350.3038869-4-steffen.klassert@secunet.com> (raw)
In-Reply-To: <20220106091350.3038869-1-steffen.klassert@secunet.com>

From: Jean Sacren <sakiwit@gmail.com>

!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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index edc673e78114..9341298b2a70 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -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,
-- 
2.25.1


  parent reply	other threads:[~2022-01-06  9:14 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-06  9:13 pull request (net-next): ipsec-next 2022-01-06 Steffen Klassert
2022-01-06  9:13 ` [PATCH 1/7] ipv6/esp6: Remove structure variables and alignment statements Steffen Klassert
2022-01-06 12:20   ` patchwork-bot+netdevbpf
2022-01-06  9:13 ` [PATCH 2/7] xfrm: Remove duplicate assignment Steffen Klassert
2022-01-06  9:13 ` Steffen Klassert [this message]
2022-01-06  9:13 ` [PATCH 4/7] xfrm: update SA curlft.use_time Steffen Klassert
2022-01-06  9:13 ` [PATCH 5/7] xfrm: Add support for SM3 secure hash Steffen Klassert
2022-01-06  9:13 ` [PATCH 6/7] xfrm: Add support for SM4 symmetric cipher algorithm Steffen Klassert
2022-01-06  9:13 ` [PATCH 7/7] xfrm: rate limit SA mapping change message to user space Steffen Klassert
2022-01-06 12:20 ` pull request (net-next): ipsec-next 2022-01-06 patchwork-bot+netdevbpf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220106091350.3038869-4-steffen.klassert@secunet.com \
    --to=steffen.klassert@secunet.com \
    --cc=davem@davemloft.net \
    --cc=herbert@gondor.apana.org.au \
    --cc=kuba@kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).