netdev - Re: [PATCH 2/5] sit: strictly restrict incoming traffic to tunnel link device

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 15 May 2009 15:24:39 +0200
From:	Jiri Pirko <jpirko@...hat.com>
To:	Sascha Hlusiak <contact@...chahlusiak.de>
Cc:	netdev@...r.kernel.org
Subject: Re: [PATCH 2/5] sit: strictly restrict incoming traffic to tunnel
	link device

Fri, May 15, 2009 at 02:52:48PM CEST, contact@...chahlusiak.de wrote:
>Check link device when looking up a tunnel. When a tunnel is
>linked to a interface, traffic from a different interface must not
>reach the tunnel.
>
>This also allows creating of multiple tunnels with the same
>endpoints, if the link device differs.
>---
> net/ipv6/sit.c |   25 ++++++++++++++++++-------
> 1 files changed, 18 insertions(+), 7 deletions(-)
>
>diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
>index bd63a7e..dc73d6a 100644
>--- a/net/ipv6/sit.c
>+++ b/net/ipv6/sit.c
>@@ -80,7 +80,7 @@ struct sit_net {
> static DEFINE_RWLOCK(ipip6_lock);
> 
> static struct ip_tunnel * ipip6_tunnel_lookup(struct net *net,
>-		__be32 remote, __be32 local)
>+		struct net_device *dev, __be32 remote, __be32 local)
> {
> 	unsigned h0 = HASH(remote);
> 	unsigned h1 = HASH(local);
>@@ -89,15 +89,21 @@ static struct ip_tunnel * ipip6_tunnel_lookup(struct net *net,
> 
> 	for (t = sitn->tunnels_r_l[h0^h1]; t; t = t->next) {
> 		if (local == t->parms.iph.saddr &&
>-		    remote == t->parms.iph.daddr && (t->dev->flags&IFF_UP))
>+		    remote == t->parms.iph.daddr &&
>+		    (!dev || !t->parms.link || dev->iflink == t->parms.link) &&
>+		    (t->dev->flags&IFF_UP))
				  ^
				  nicer with spaces around?
> 			return t;
> 	}
> 	for (t = sitn->tunnels_r[h0]; t; t = t->next) {
>-		if (remote == t->parms.iph.daddr && (t->dev->flags&IFF_UP))
>+		if (remote == t->parms.iph.daddr &&
>+		    (!dev || !t->parms.link || dev->iflink == t->parms.link) &&
>+		    (t->dev->flags&IFF_UP))
> 			return t;
> 	}
> 	for (t = sitn->tunnels_l[h1]; t; t = t->next) {
>-		if (local == t->parms.iph.saddr && (t->dev->flags&IFF_UP))
>+		if (local == t->parms.iph.saddr &&
>+		    (!dev || !t->parms.link || dev->iflink == t->parms.link) &&
>+		    (t->dev->flags&IFF_UP))
> 			return t;
> 	}
> 	if ((t = sitn->tunnels_wc[0]) != NULL && (t->dev->flags&IFF_UP))
>@@ -165,7 +171,9 @@ static struct ip_tunnel * ipip6_tunnel_locate(struct net *net,
> 	struct sit_net *sitn = net_generic(net, sit_net_id);
> 
> 	for (tp = __ipip6_bucket(sitn, parms); (t = *tp) != NULL; tp = &t->next) {
>-		if (local == t->parms.iph.saddr && remote == t->parms.iph.daddr) {
>+		if (local == t->parms.iph.saddr &&
>+		    remote == t->parms.iph.daddr &&
>+		    parms->link == t->parms.link) {
> 			if (create)
> 				return NULL;
> 			else 	return t;
>@@ -449,7 +457,10 @@ static int ipip6_err(struct sk_buff *skb, u32 info)
> 	err = -ENOENT;
> 
> 	read_lock(&ipip6_lock);
>-	t = ipip6_tunnel_lookup(dev_net(skb->dev), iph->daddr, iph->saddr);
>+	t = ipip6_tunnel_lookup(dev_net(skb->dev),
>+				skb->dev,
>+				iph->daddr,
>+				iph->saddr);
> 	if (t == NULL || t->parms.iph.daddr == 0)
> 		goto out;
> 
>@@ -484,7 +495,7 @@ static int ipip6_rcv(struct sk_buff *skb)
> 	iph = ip_hdr(skb);
> 
> 	read_lock(&ipip6_lock);
>-	if ((tunnel = ipip6_tunnel_lookup(dev_net(skb->dev),
>+	if ((tunnel = ipip6_tunnel_lookup(dev_net(skb->dev), skb->dev,
> 					iph->saddr, iph->daddr)) != NULL) {
ERROR: do not use assignment in if condition
#77: FILE: net/ipv6/sit.c:498:
+	if ((tunnel = ipip6_tunnel_lookup(dev_net(skb->dev), skb->dev,

Since you are touching this it would be nice to make this right.

> 		secpath_reset(skb);
> 		skb->mac_header = skb->network_header;
>-- 
>1.6.3
>
>--
>To unsubscribe from this list: send the line "unsubscribe netdev" in
>the body of a message to majordomo@...r.kernel.org
>More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html