netdev
[Top] [All Lists]

Re: [PATCH 2.6]: Check against correct policy list in ip_forward/ip6_for

To: Patrick McHardy <kaber@xxxxxxxxx>
Subject: Re: [PATCH 2.6]: Check against correct policy list in ip_forward/ip6_forward
From: Patrick McHardy <kaber@xxxxxxxxx>
Date: Mon, 18 Oct 2004 00:42:07 +0200
Cc: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>, "David S. Miller" <davem@xxxxxxxxxx>, netdev@xxxxxxxxxxx, ipsec-tools-devel@xxxxxxxxxxxxxxxxxxxxx
In-reply-to: <4172F1AB.4020305@xxxxxxxxx>
References: <4172943B.8050904@xxxxxxxxx> <20041017212317.GA28615@xxxxxxxxxxxxxxxxxxx> <4172F1AB.4020305@xxxxxxxxx>
Sender: netdev-bounce@xxxxxxxxxxx
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.6) Gecko/20040413 Debian/1.6-5
Patrick McHardy wrote:

Thanks, I didn't know pluto uses the xfrm_user interface, so
I only looked for pfkey symbolic names. So it seems only racoon
needs to be fixed. I think we should apply the attached patch
to make xfrm_policy_check reject packets decapsulated by IPsec
without a policy for this direction, so people will notice
something is wrong. It also prevents skipping checks against the
socket policy if there is an empty policy list .. or am I missing
something ?

Obsiously I did :) This patch should be better.

Regards
Patrick

--- a/include/net/xfrm.h        2004-10-18 00:15:18 +02:00
+++ b/include/net/xfrm.h        2004-10-18 00:15:18 +02:00
@@ -601,7 +601,7 @@
        if (sk && sk->sk_policy[XFRM_POLICY_IN])
                return __xfrm_policy_check(sk, dir, skb, family);
                
-       return  !xfrm_policy_list[dir] ||
+       return  ((!sk || !sk->sk_policy[dir]) && !xfrm_policy_list[dir] && 
!skb->sp) ||
                (skb->dst->flags & DST_NOPOLICY) ||
                __xfrm_policy_check(sk, dir, skb, family);
}

===== include/net/xfrm.h 1.68 vs edited =====
--- 1.68/include/net/xfrm.h     2004-09-10 23:35:53 +02:00
+++ edited/include/net/xfrm.h   2004-10-18 00:41:28 +02:00
@@ -601,7 +601,7 @@
        if (sk && sk->sk_policy[XFRM_POLICY_IN])
                return __xfrm_policy_check(sk, dir, skb, family);
                
-       return  !xfrm_policy_list[dir] ||
+       return  (!xfrm_policy_list[dir] && !skb->sp) ||
                (skb->dst->flags & DST_NOPOLICY) ||
                __xfrm_policy_check(sk, dir, skb, family);
 }
<Prev in Thread] Current Thread [Next in Thread>