From mboxrd@z Thu Jan 1 00:00:00 1970 From: Florian Westphal Subject: [PATCH net-next v2 10/13] xfrm: use secpath_exist where applicable Date: Tue, 18 Dec 2018 17:15:24 +0100 Message-ID: <20181218161527.2760-11-fw@strlen.de> References: <20181218161527.2760-1-fw@strlen.de> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Cc: Florian Westphal To: Return-path: Received: from Chamillionaire.breakpoint.cc ([146.0.238.67]:58448 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727205AbeLRQNl (ORCPT ); Tue, 18 Dec 2018 11:13:41 -0500 In-Reply-To: <20181218161527.2760-1-fw@strlen.de> Sender: netdev-owner@vger.kernel.org List-ID: Will reduce noise when skb->sp is removed later in this series. Signed-off-by: Florian Westphal --- include/net/xfrm.h | 2 +- net/xfrm/xfrm_interface.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 71411ebaf765..da781735c21c 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -1182,7 +1182,7 @@ static inline int __xfrm_policy_check2(struct sock *sk, int dir, if (sk && sk->sk_policy[XFRM_POLICY_IN]) return __xfrm_policy_check(sk, ndir, skb, family); - return (!net->xfrm.policy_count[dir] && !skb->sp) || + return (!net->xfrm.policy_count[dir] && !secpath_exists(skb)) || (skb_dst(skb)->flags & DST_NOPOLICY) || __xfrm_policy_check(sk, ndir, skb, family); } diff --git a/net/xfrm/xfrm_interface.c b/net/xfrm/xfrm_interface.c index d679fa0f44b3..6be8c7df15bb 100644 --- a/net/xfrm/xfrm_interface.c +++ b/net/xfrm/xfrm_interface.c @@ -251,7 +251,7 @@ static int xfrmi_rcv_cb(struct sk_buff *skb, int err) struct xfrm_if *xi; bool xnet; - if (err && !skb->sp) + if (err && !secpath_exists(skb)) return 0; x = xfrm_input_state(skb); -- 2.19.2