aboutsummaryrefslogtreecommitdiffstats
path: root/net/xfrm
diff options
context:
space:
mode:
Diffstat (limited to 'net/xfrm')
-rw-r--r--net/xfrm/xfrm_policy.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index f1cdcfb90959..56abb5c057d4 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -1046,7 +1046,7 @@ xfrm_decode_session(struct sk_buff *skb, struct flowi *fl, unsigned short family
1046} 1046}
1047EXPORT_SYMBOL(xfrm_decode_session); 1047EXPORT_SYMBOL(xfrm_decode_session);
1048 1048
1049static inline int secpath_has_tunnel(struct sec_path *sp, int k) 1049static inline int secpath_has_nontransport(struct sec_path *sp, int k)
1050{ 1050{
1051 for (; k < sp->len; k++) { 1051 for (; k < sp->len; k++) {
1052 if (sp->xvec[k]->props.mode != XFRM_MODE_TRANSPORT) 1052 if (sp->xvec[k]->props.mode != XFRM_MODE_TRANSPORT)
@@ -1087,7 +1087,7 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb,
1087 xfrm_policy_lookup); 1087 xfrm_policy_lookup);
1088 1088
1089 if (!pol) 1089 if (!pol)
1090 return !skb->sp || !secpath_has_tunnel(skb->sp, 0); 1090 return !skb->sp || !secpath_has_nontransport(skb->sp, 0);
1091 1091
1092 pol->curlft.use_time = (unsigned long)xtime.tv_sec; 1092 pol->curlft.use_time = (unsigned long)xtime.tv_sec;
1093 1093
@@ -1111,7 +1111,7 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb,
1111 goto reject; 1111 goto reject;
1112 } 1112 }
1113 1113
1114 if (secpath_has_tunnel(sp, k)) 1114 if (secpath_has_nontransport(sp, k))
1115 goto reject; 1115 goto reject;
1116 1116
1117 xfrm_pol_put(pol); 1117 xfrm_pol_put(pol);