diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2005-09-27 15:44:36 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-09-27 15:44:36 -0700 |
| commit | a83cd2cc90bd9390cf03cd40bba204d9ed520633 (patch) | |
| tree | b5c829bd75b2252a7fe0232c7625035783a2eaea /net/rose | |
| parent | 70ff3b66d79c5110e533f3f2aea1a5b2fc5f8d90 (diff) | |
| download | linux-a83cd2cc90bd9390cf03cd40bba204d9ed520633.tar.gz linux-a83cd2cc90bd9390cf03cd40bba204d9ed520633.tar.bz2 linux-a83cd2cc90bd9390cf03cd40bba204d9ed520633.zip | |
[ROSE]: check rose_ndevs earlier
* Don't bother with proto registering if rose_ndevs is bad.
* Make escape structure more coherent.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rose')
| -rw-r--r-- | net/rose/af_rose.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index dbfb0e3dc798..0f96565a64ec 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c @@ -1472,24 +1472,25 @@ static const char banner[] = KERN_INFO "F6FBB/G4KLX ROSE for Linux. Version 0.62 static int __init rose_proto_init(void) { int i; - int rc = proto_register(&rose_proto, 0); + int rc; + if (rose_ndevs > 0x7FFFFFFF/sizeof(struct net_device *)) { + printk(KERN_ERR "ROSE: rose_proto_init - rose_ndevs parameter to large\n"); + rc = -EINVAL; + goto out; + } + + rc = proto_register(&rose_proto, 0); if (rc != 0) goto out; rose_callsign = null_ax25_address; - if (rose_ndevs > 0x7FFFFFFF/sizeof(struct net_device *)) { - printk(KERN_ERR "ROSE: rose_proto_init - rose_ndevs parameter to large\n"); - proto_unregister(&rose_proto); - return -EINVAL; - } - dev_rose = kmalloc(rose_ndevs * sizeof(struct net_device *), GFP_KERNEL); if (dev_rose == NULL) { printk(KERN_ERR "ROSE: rose_proto_init - unable to allocate device structure\n"); - proto_unregister(&rose_proto); - return -ENOMEM; + rc = -ENOMEM; + goto out_proto_unregister; } memset(dev_rose, 0x00, rose_ndevs * sizeof(struct net_device*)); @@ -1540,6 +1541,7 @@ fail: free_netdev(dev_rose[i]); } kfree(dev_rose); +out_proto_unregister: proto_unregister(&rose_proto); goto out; } |