diff mbox series

[net-next,10/13] xfrm: use secpath_exist where applicable

Message ID	20181210145006.19098-11-fw@strlen.de
State	Changes Requested, archived
Delegated to:	David Miller
Headers	show Return-Path: <netdev-owner@vger.kernel.org> From: Florian Westphal <fw@strlen.de> To: <netdev@vger.kernel.org> Cc: Florian Westphal <fw@strlen.de> Subject: [PATCH net-next 10/13] xfrm: use secpath_exist where applicable Date: Mon, 10 Dec 2018 15:50:03 +0100 Message-Id: <20181210145006.19098-11-fw@strlen.de> In-Reply-To: <20181210145006.19098-1-fw@strlen.de> References: <20181210145006.19098-1-fw@strlen.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk
Series	sk_buff: add extension infrastructure \| expand [net-next,0/13] sk_buff: add extension infrastructure [net-next,01/13] netfilter: avoid using skb->nf_bridge directly [net-next,02/13] sk_buff: add skb extension infrastructure [net-next,03/13] net: convert bridge_nf to use skb extension infrastructure [net-next,04/13] xfrm: change secpath_set to return secpath struct, not error value [net-next,05/13] net: move secpath_exist helper to sk_buff.h [net-next,06/13] net: use skb_sec_path helper in more places [net-next,07/13] drivers: net: intel: use secpath helpers in more places [net-next,08/13] drivers: net: ethernet: mellanox: use skb_sec_path helper [net-next,09/13] drivers: net: netdevsim: use skb_sec_path helper [net-next,10/13] xfrm: use secpath_exist where applicable [net-next,11/13] drivers: chelsio: use skb_sec_path helper [net-next,12/13] xfrm: prefer secpath_set over secpath_dup [net-next,13/13] net: switch secpath to use skb extension infrastructure

Commit Message

Florian Westphal Dec. 10, 2018, 2:50 p.m. UTC

Will reduce noise when skb->sp is removed later in this series.

Signed-off-by: Florian Westphal <fw@strlen.de>
---
 include/net/xfrm.h        | 2 +-
 net/xfrm/xfrm_interface.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff mbox series

Patch

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);