From: Steffen Klassert <steffen.klassert@secunet.com>
To: David Miller <davem@davemloft.net>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
Steffen Klassert <steffen.klassert@secunet.com>,
<netdev@vger.kernel.org>
Subject: [PATCH 11/12] vti4: Check the tunnel endpoints of the xfrm state and the vti interface
Date: Thu, 27 Feb 2014 09:00:39 +0100 [thread overview]
Message-ID: <1393488040-22005-12-git-send-email-steffen.klassert@secunet.com> (raw)
In-Reply-To: <1393488040-22005-1-git-send-email-steffen.klassert@secunet.com>
The tunnel endpoints of the xfrm_state we got from the xfrm_lookup
must match the tunnel endpoints of the vti interface. This patch
ensures this matching.
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---
net/ipv4/ip_vti.c | 29 ++++++++++++++++++++++++-----
1 file changed, 24 insertions(+), 5 deletions(-)
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
index 9369b7c..9471893 100644
--- a/net/ipv4/ip_vti.c
+++ b/net/ipv4/ip_vti.c
@@ -123,10 +123,32 @@ static int vti_rcv_cb(struct sk_buff *skb, int err)
return 0;
}
+static bool vti_state_check(const struct xfrm_state *x, __be32 dst, __be32 src)
+{
+ xfrm_address_t *daddr = (xfrm_address_t *)&dst;
+ xfrm_address_t *saddr = (xfrm_address_t *)&src;
+
+ /* if there is no transform then this tunnel is not functional.
+ * Or if the xfrm is not mode tunnel.
+ */
+ if (!x || x->props.mode != XFRM_MODE_TUNNEL ||
+ x->props.family != AF_INET)
+ return false;
+
+ if (!dst)
+ return xfrm_addr_equal(saddr, &x->props.saddr, AF_INET);
+
+ if (!xfrm_state_addr_check(x, daddr, saddr, AF_INET))
+ return false;
+
+ return true;
+}
+
static netdev_tx_t vti_xmit(struct sk_buff *skb, struct net_device *dev,
struct flowi *fl)
{
struct ip_tunnel *tunnel = netdev_priv(dev);
+ struct ip_tunnel_parm *parms = &tunnel->parms;
struct dst_entry *dst = skb_dst(skb);
struct net_device *tdev; /* Device to other host */
int err;
@@ -143,15 +165,12 @@ static netdev_tx_t vti_xmit(struct sk_buff *skb, struct net_device *dev,
goto tx_error_icmp;
}
- /* if there is no transform then this tunnel is not functional.
- * Or if the xfrm is not mode tunnel.
- */
- if (!dst->xfrm ||
- dst->xfrm->props.mode != XFRM_MODE_TUNNEL) {
+ if (!vti_state_check(dst->xfrm, parms->iph.daddr, parms->iph.saddr)) {
dev->stats.tx_carrier_errors++;
dst_release(dst);
goto tx_error_icmp;
}
+
tdev = dst->dev;
if (tdev == dev) {
--
1.7.9.5
next prev parent reply other threads:[~2014-02-27 8:01 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-27 8:00 pull request (net-next): ipsec-next 2014-02-27 Steffen Klassert
2014-02-27 8:00 ` [PATCH 01/12] xfrm4: Add IPsec protocol multiplexer Steffen Klassert
2014-02-27 8:00 ` [PATCH 02/12] esp4: Use the IPsec protocol multiplexer API Steffen Klassert
2014-02-27 8:00 ` [PATCH 03/12] ah4: " Steffen Klassert
2014-02-27 8:00 ` [PATCH 04/12] ipcomp4: " Steffen Klassert
2014-02-27 8:00 ` [PATCH 05/12] xfrm: Add xfrm_tunnel_skb_cb to the skb common buffer Steffen Klassert
2014-02-27 8:00 ` [PATCH 06/12] ip_tunnel: Make vti work with i_key set Steffen Klassert
2014-02-27 8:00 ` [PATCH 07/12] vti: Update the ipv4 side to use it's own receive hook Steffen Klassert
2014-02-27 10:42 ` Neil Jerram
2014-02-27 8:00 ` [PATCH 08/12] xfrm4: Remove xfrm_tunnel_notifier Steffen Klassert
2014-02-27 8:00 ` [PATCH 09/12] vti4: Use the on xfrm_lookup returned dst_entry directly Steffen Klassert
2014-02-27 8:00 ` [PATCH 10/12] vti4: Support inter address family tunneling Steffen Klassert
2014-02-27 8:00 ` Steffen Klassert [this message]
2014-02-27 8:00 ` [PATCH 12/12] vti4: Enable namespace changing Steffen Klassert
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=1393488040-22005-12-git-send-email-steffen.klassert@secunet.com \
--to=steffen.klassert@secunet.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--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).