Don't create tunnels with '%' in name.
Subsystems (3)
PATCH 1/1 Don't create tunnels with '%' in name.
Four tunnel drivers (ip_gre, ipip, ip6_tunnel and sit) can receive a pre-defined name for a device from the userspace. Since these drivers call the register_netdevice() after this (rtnl_lock is held), the device's name may contain a '%' character.
Not sure how bad is this to have a device with a '%' in its name, but all the other places either use the register_netdev(), or explicitly call dev_alloc_name() before registering, i.e. do not allow for such names.
---
net/ipv4/ip_gre.c +9 -4
@@ -274,19 +274,24 @@ static struct ip_tunnel * ipgre_tunnel_locate(struct ip_tunnel_parm *parms, intif (!dev)return NULL ; +if (strchr (name,'%' )) { +if (dev_alloc_name (dev, name) <0 ) + goto failed_free; + } + dev->init = ipgre_tunnel_init; nt =netdev_priv (dev); nt->parms = *parms; -if (register_netdevice (dev) <0 ) { -free_netdev (dev); - goto failed; - } +if (register_netdevice (dev) <0 ) + goto failed_free;dev_hold (dev);ipgre_tunnel_link (nt);return nt; +failed_free: +free_netdev (dev); failed:return NULL ; }
net/ipv4/ipip.c +9 -4
@@ -236,19 +236,24 @@ static struct ip_tunnel * ipip_tunnel_locate(struct ip_tunnel_parm *parms, int cif (dev ==NULL )return NULL ; +if (strchr (name,'%' )) { +if (dev_alloc_name (dev, name) <0 ) + goto failed_free; + } + nt =netdev_priv (dev); dev->init = ipip_tunnel_init; nt->parms = *parms; -if (register_netdevice (dev) <0 ) { -free_netdev (dev); - goto failed; - } +if (register_netdevice (dev) <0 ) + goto failed_free;dev_hold (dev);ipip_tunnel_link (nt);return nt; +failed_free: +free_netdev (dev); failed:return NULL ; }
net/ipv6/ip6_tunnel.c +11 -4
@@ -245,17 +245,24 @@ static struct ip6_tnl *ip6_tnl_create(struct ip6_tnl_parm *p)if (dev ==NULL ) goto failed; +if (strchr (name,'%' )) { +if (dev_alloc_name (dev, name) <0 ) + goto failed_free; + } + t =netdev_priv (dev); dev->init = ip6_tnl_dev_init; t->parms = *p; -if ((err =register_netdevice (dev)) <0 ) { -free_netdev (dev); - goto failed; - } +if ((err =register_netdevice (dev)) <0 ) + goto failed_free; +dev_hold (dev);ip6_tnl_link (t);return t; + +failed_free: +free_netdev (dev); failed:return NULL ; }
net/ipv6/sit.c +9 -4
@@ -179,6 +179,11 @@ static struct ip_tunnel * ipip6_tunnel_locate(struct ip_tunnel_parm *parms, intif (dev ==NULL )return NULL ; +if (strchr (name,'%' )) { +if (dev_alloc_name (dev, name) <0 ) + goto failed_free; + } + nt =netdev_priv (dev); dev->init = ipip6_tunnel_init; nt->parms = *parms;
@@ -186,16 +191,16 @@ static struct ip_tunnel * ipip6_tunnel_locate(struct ip_tunnel_parm *parms, intif (parms->i_flags &SIT_ISATAP ) dev->priv_flags |=IFF_ISATAP ; -if (register_netdevice (dev) <0 ) { -free_netdev (dev); - goto failed; - } +if (register_netdevice (dev) <0 ) + goto failed_free;dev_hold (dev);ipip6_tunnel_link (nt);return nt; +failed_free: +free_netdev (dev); failed:return NULL ; }
Quoted 17 lines · Pavel Emelyanov
Four tunnel drivers (
ip_gre, ipip,ip6_tunneland sit) can
receive a pre-defined name for a device from the userspace.
Since these drivers call theregister_netdevice()after this (rtnl_lockis held), the device's name may contain a '%' character.Not sure how bad is this to have a device with a '%' in its
name, but all the other places either use theregister_netdev(),
or explicitly calldev_alloc_name()before registering, i.e. do not allow for such names.Signed-off-by Pavel Emelyanov <[email protected]>---
net/ipv4/ip_gre.c +0
-0
net/ipv4/ip_gre.c static struct ip_tunnel * ipgre_tunnel_locate(struct ip_tunnel_parm *parms, int · line 281
Quoted 8 lines
net/ipv4/ip_gre.c +5
-0@@ -274,19 +274,24 @@ static struct ip_tunnel * ipgre_tunnel_locate(struct ip_tunnel_parm *parms, intif (!dev)return NULL ; +if (strchr (name,'%' )) { +if (dev_alloc_name (dev, name) <0 ) + goto failed_free; + } +
It would be nicer to replace the entire hand-made name allocation to remove the 100 device limit.
Quoted 24 lines · Patrick McHardy
Quoted 23 lines · Pavel Emelyanov
Four tunnel drivers (
ip_gre, ipip,ip6_tunneland sit) can receive a pre-defined name for a device from the userspace. Since these drivers call theregister_netdevice()after this (rtnl_lockis held), the device's name may contain a '%' character.Not sure how bad is this to have a device with a '%' in its name, but all the other places either use the
register_netdev(), or explicitly calldev_alloc_name()before registering, i.e. do not allow for such names.Signed-off-by Pavel Emelyanov <[email protected]>---
net/ipv4/ip_gre.c +0
-0@@ -274,19 +274,24 @@ static struct ip_tunnel * ipgre_tunnel_locate(struct ip_tunnel_parm *parms, intif (!dev)return NULL ;
Quoted 10 lines
net/ipv4/ip_gre.c static struct ip_tunnel * ipgre_tunnel_locate(struct ip_tunnel_parm *parms, int · line 281
Quoted 5 lines
net/ipv4/ip_gre.c +5
-0+if (strchr (name,'%' )) { +if (dev_alloc_name (dev, name) <0 ) + goto failed_free; + } +It would be nicer to replace the entire hand-made name allocation to remove the 100 device limit.
Actually, I thought the same, but fixing % in names looks like a BUG-fix for 2.6.25, while removing the hand-made name allocation looks like an enhancement for 2.6.26. No?
Thanks,
Pavel
Quoted 7 lines · Pavel Emelyanov
Quoted 3 lines · Patrick McHardy
It would be nicer to replace the entire hand-made name allocation to remove the 100 device limit.
Actually, I thought the same, but fixing % in names looks like a BUG-fix for 2.6.25, while removing the hand-made name allocation looks like an enhancement for 2.6.26. No?
Well, its so closely related that I guess it would still look like a bugfix :) But changing this in 2.6.26 is also fine of course, your patch just reminded me since I wanted to change this for a long time and repeatedly forgot about it again.
PATCH 1/1 Don't limit the number of tunnels with generic name explicitly.
Quoted 11 lines · Patrick McHardy
Quoted 8 lines · Pavel Emelyanov
Quoted 3 lines · Patrick McHardy
It would be nicer to replace the entire hand-made name allocation to remove the 100 device limit.
Actually, I thought the same, but fixing % in names looks like a BUG-fix for 2.6.25, while removing the hand-made name allocation looks like an enhancement for 2.6.26. No?
Quoted 4 lines
Well, its so closely related that I guess it would still look like a bugfix :) But changing this in 2.6.26 is also fine of course, your patch just reminded me since I wanted to change this for a long time and repeatedly forgot about it again.
Ok, point taken ;) Here's the 2nd patch that does so. If David decides it can go to 2.6.25, that would be good, otherwise this patch will fit the 2.6.26 as well.
Changelog:
Use the added dev_alloc_name() call to create tunnel device name, rather than iterate in a hand-made loop with an artificial limit.
Thanks Patrick for noticing this.
---
include/net/ip6_tunnel.h +0 -2
@@ -14,8 +14,6 @@/* capable of receiving packets */ #define IP6_TNL_F_CAP_RCV 0x20000 -#define IP6_TNL_MAX 128 -/* IPv6 tunnel */ struct ip6_tnl {
net/ipv4/ip_gre.c +2 -11
@@ -259,16 +259,8 @@ static struct ip_tunnel * ipgre_tunnel_locate(struct ip_tunnel_parm *parms, intif (parms->name[0 ])strlcpy (name, parms->name,IFNAMSIZ ); -else { -int i; -for (i=1 ; i<100 ; i++) { -sprintf (name,"gre%d" , i); -if (__dev_get_by_name (&init_net, name) ==NULL ) -break ; - } -if (i==100 ) - goto failed; - } +else +sprintf (name,"gre%%d" ); dev =alloc_netdev (sizeof (*t), name, ipgre_tunnel_setup);if (!dev)
@@ -292,7 +284,6 @@ static struct ip_tunnel * ipgre_tunnel_locate(struct ip_tunnel_parm *parms, int failed_free:free_netdev (dev); -failed:return NULL ; }
net/ipv4/ipip.c +2 -11
@@ -221,16 +221,8 @@ static struct ip_tunnel * ipip_tunnel_locate(struct ip_tunnel_parm *parms, int cif (parms->name[0 ])strlcpy (name, parms->name,IFNAMSIZ ); -else { -int i; -for (i=1 ; i<100 ; i++) { -sprintf (name,"tunl%d" , i); -if (__dev_get_by_name (&init_net, name) ==NULL ) -break ; - } -if (i==100 ) - goto failed; - } +else +sprintf (name,"tunl%%d" ); dev =alloc_netdev (sizeof (*t), name, ipip_tunnel_setup);if (dev ==NULL )
@@ -254,7 +246,6 @@ static struct ip_tunnel * ipip_tunnel_locate(struct ip_tunnel_parm *parms, int c failed_free:free_netdev (dev); -failed:return NULL ; }
net/ipv6/ip6_tunnel.c +4 -11
@@ -229,18 +229,11 @@ static struct ip6_tnl *ip6_tnl_create(struct ip6_tnl_parm *p)char name[IFNAMSIZ ];int err; -if (p->name[0 ]) { +if (p->name[0 ])strlcpy (name, p->name,IFNAMSIZ ); - }else { -int i; -for (i =1 ; i <IP6_TNL_MAX ; i++) { -sprintf (name,"ip6tnl%d" , i); -if (__dev_get_by_name (&init_net, name) ==NULL ) -break ; - } -if (i ==IP6_TNL_MAX ) - goto failed; - } +else +sprintf (name,"ip6tnl%%d" ); + dev =alloc_netdev (sizeof (*t), name, ip6_tnl_dev_setup);if (dev ==NULL ) goto failed;
net/ipv6/sit.c +2 -10
@@ -164,16 +164,8 @@ static struct ip_tunnel * ipip6_tunnel_locate(struct ip_tunnel_parm *parms, intif (parms->name[0 ])strlcpy (name, parms->name,IFNAMSIZ ); -else { -int i; -for (i=1 ; i<100 ; i++) { -sprintf (name,"sit%d" , i); -if (__dev_get_by_name (&init_net, name) ==NULL ) -break ; - } -if (i==100 ) - goto failed; - } +else +sprintf (name,"sit%%d" ); dev =alloc_netdev (sizeof (*t), name, ipip6_tunnel_setup);if (dev ==NULL )
Re: [PATCH] Don't limit the number of tunnels with generic name explicitly.
Quoted 16 lines · Pavel Emelyanov
Quoted 6 lines · Patrick McHardy
Quoted 5 lines · Pavel Emelyanov
Quoted 3 lines · Patrick McHardy
It would be nicer to replace the entire hand-made name allocation to remove the 100 device limit.
Quoted 6 lines
Quoted 1 line
Actually, I thought the same, but fixing % in names looks like a BUG-fix for 2.6.25, while removing the hand-made name allocation looks like an enhancement for 2.6.26. No?
Well, its so closely related that I guess it would still look like a bugfix :) But changing this in 2.6.26 is also fine of course, your patch just reminded me since I wanted to change this for a long time and repeatedly forgot about it again.
Ok, point taken ;) Here's the 2nd patch that does so. If David decides it can go to 2.6.25, that would be good, otherwise this patch will fit the 2.6.26 as well.
Quoted 8 lines
Changelog:
Use the added
dev_alloc_name()call to create tunnel device name, rather than iterate in a hand-made loop with an artificial limit.Thanks Patrick for noticing this.
Signed-off-by Pavel Emelyanov <[email protected]>
Looks good to me, thanks.
Re: [PATCH] Don't limit the number of tunnels with generic name explicitly.
In reply to Pavel EmelyanovFrom: Pavel Emelyanov <[email protected]>
Date: Thu, 21 Feb 2008 15:38:16 +0300
Quoted 8 lines
Changelog:
Use the added
dev_alloc_name()call to create tunnel device name, rather than iterate in a hand-made loop with an artificial limit.Thanks Patrick for noticing this.
Signed-off-by Pavel Emelyanov <[email protected]>
Applied, but I had to rework this in two places that didn't apply cleanly.
The ip_gre.c and ipip.c changes remove a "failed" label but that can't be done in the current tree as there are other existing references.
Re: [PATCH] Don't limit the number of tunnels with generic name explicitly.
Quoted 8 lines · David Miller
From: Pavel Emelyanov <[email protected]>
Date: Thu, 21 Feb 2008 15:38:16 +0300Quoted 5 lines
Changelog:
Use the added
dev_alloc_name()call to create tunnel device name, rather than iterate in a hand-made loop with an artificial limit.
Quoted 6 lines
Quoted 3 lines
Thanks Patrick for noticing this.
Signed-off-by Pavel Emelyanov <[email protected]>Applied, but I had to rework this in two places that didn't apply cleanly.
That's because you skipped the first patch titled "Don't create tunnels with '%' in name.", which adds the dev_alloc_name() call and tosses the error paths a bit. Without this first patch, these four drivers become broken :( When user doesn't specify the name, the device's name will be e.g. "tunl%d", but not "tunl0" like he expects.
Quoted 4 lines
The
ip_gre.candipip.cchanges remove a "failed" label but that can't be done in the current tree as there are other existing references.
Yup :( this code was removed in that first patch...
David Miller
maintainerRe: [PATCH] Don't limit the number of tunnels with generic name explicitly.
From: Pavel Emelyanov <[email protected]>
Date: Tue, 26 Feb 2008 10:47:44 +0300
Quoted 6 lines
That's because you skipped the first patch titled "Don't create tunnels with '%' in name.", which adds the
dev_alloc_name()call and tosses the error paths a bit. Without this first patch, these four drivers become broken :( When user doesn't specify the name, the device's name will be e.g. "tunl%d", but not "tunl0" like he expects.
Please respin and post the first patch, I had no idea there was a dependency.