Re: [PATCH] wanrouter: fix stack usage

From: Jörn Engel (joern@wohnheim.fh-wedel.de)
Date: Sat Jun 07 2003 - 19:10:27 EST


On Sun, 8 June 2003 01:59:03 +0100, James Stevenson wrote:
>
> i am guessing it doesnt compile.
>
> int err;
> err -ENOBUFS; ????
>
>
> - return -ENOBUFS;
> + err -ENOBUFS;
> + goto out;

Good catch! BTW, it did compile, but with c that doesn't mean a lot
and with #ifdefs even less.

Updated patch below.

Jörn

-- 
Anything that can go wrong, will.
-- Finagle's Law

--- linux-2.5.70-bk12/net/wanrouter/wanmain.c~stackfix_wanrouter 2003-06-05 17:47:43.000000000 +0200 +++ linux-2.5.70-bk12/net/wanrouter/wanmain.c 2003-06-08 02:05:09.000000000 +0200 @@ -668,7 +668,7 @@ static int wanrouter_device_new_if(struct wan_device *wandev, wanif_conf_t *u_conf) { - wanif_conf_t conf; + wanif_conf_t *cnf; struct net_device *dev = NULL; #ifdef CONFIG_WANPIPE_MULTPPP struct ppp_device *pppdev=NULL; @@ -678,38 +678,47 @@ if ((wandev->state == WAN_UNCONFIGURED) || (wandev->new_if == NULL)) return -ENODEV; - if (copy_from_user(&conf, u_conf, sizeof(wanif_conf_t))) - return -EFAULT; + cnf = kmalloc(sizeof(wanif_conf_t), GFP_KERNEL); + if (!cnf) + return -ENOBUFS; - if (conf.magic != ROUTER_MAGIC) - return -EINVAL; + err = -EFAULT; + if (copy_from_user(cnf, u_conf, sizeof(wanif_conf_t))) + goto out; - if (conf.config_id == WANCONFIG_MPPP) { + err = -EINVAL; + if (cnf->magic != ROUTER_MAGIC) + goto out; + + if (cnf->config_id == WANCONFIG_MPPP) { #ifdef CONFIG_WANPIPE_MULTPPP pppdev = kmalloc(sizeof(struct ppp_device), GFP_KERNEL); + err = -ENOBUFS; if (pppdev == NULL) - return -ENOBUFS; + goto out; memset(pppdev, 0, sizeof(struct ppp_device)); pppdev->dev = kmalloc(sizeof(struct net_device), GFP_KERNEL); if (pppdev->dev == NULL) { kfree(pppdev); - return -ENOBUFS; + err = -ENOBUFS; + goto out; } memset(pppdev->dev, 0, sizeof(struct net_device)); - err = wandev->new_if(wandev, - (struct net_device *)pppdev, &conf); + err = wandev->new_if(wandev, (struct net_device *)pppdev, cnf); dev = pppdev->dev; #else printk(KERN_INFO "%s: Wanpipe Mulit-Port PPP support has not been compiled in!\n", wandev->name); - return -EPROTONOSUPPORT; + err = -EPROTONOSUPPORT; + goto out; #endif } else { dev = kmalloc(sizeof(struct net_device), GFP_KERNEL); + err = -ENOBUFS; if (dev == NULL) - return -ENOBUFS; + goto out; memset(dev, 0, sizeof(struct net_device)); - err = wandev->new_if(wandev, dev, &conf); + err = wandev->new_if(wandev, dev, cnf); } if (!err) { @@ -748,7 +757,8 @@ ++wandev->ndev; unlock_adapter_irq(&wandev->lock, &smp_flags); - return 0; /* done !!! */ + err = 0; /* done !!! */ + goto out; } } if (wandev->del_if) @@ -761,18 +771,19 @@ dev->priv = NULL; } - #ifdef CONFIG_WANPIPE_MULTPPP - if (conf.config_id == WANCONFIG_MPPP) + if (cnf->config_id == WANCONFIG_MPPP) kfree(pppdev); else kfree(dev); #else /* Sync PPP is disabled */ - if (conf.config_id != WANCONFIG_MPPP) + if (cnf->config_id != WANCONFIG_MPPP) kfree(dev); #endif +out: + kfree(cnf); return err; } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Sat Jun 07 2003 - 22:00:34 EST