Cleanup the devinet_sysctl_register
Subsystems (3)
PATCH 1/3 Cleanup the devinet_sysctl_register
I moved the call to kmalloc() from the *t declaration into the code (this is confusing when a variable is initialized with the result of some call) and removed unneeded comment near the error path. Just like I did with the neigh ctl-s.
Besides, I fixed the goto's and the labels - they were indented with spaces :(
Signed-off-by Pavel Emelyanov <[email protected]>
---
net/ipv4/devinet.c +9 -8
@@ -1507,12 +1507,13 @@ static void devinet_sysctl_register(struct in_device *in_dev, {int i;struct net_device *dev = in_dev ? in_dev->dev :NULL ; -struct devinet_sysctl_table *t =kmemdup (&devinet_sysctl,sizeof (*t), -GFP_KERNEL ); +struct devinet_sysctl_table *t;char *dev_name =NULL ; + t =kmemdup (&devinet_sysctl,sizeof (*t),GFP_KERNEL );if (!t) -return ; + goto out; +for (i =0 ; i <ARRAY_SIZE (t->devinet_vars) -1 ; i++) { t->devinet_vars[i].data += (char *)p - (char *)&ipv4_devconf; t->devinet_vars[i].extra1 = p;
@@ -1533,7 +1534,7 @@ static void devinet_sysctl_register(struct in_device *in_dev,*/ dev_name =kstrdup (dev_name,GFP_KERNEL );if (!dev_name) - goto free; + goto free; t->devinet_dev[0 ].procname = dev_name; t->devinet_dev[0 ].child = t->devinet_vars;
@@ -1543,16 +1544,16 @@ static void devinet_sysctl_register(struct in_device *in_dev, t->sysctl_header =register_sysctl_table (t->devinet_root_dir);if (!t->sysctl_header) - goto free_procname; + goto free_procname; p->sysctl = t;return ; -/* error path */ - free_procname: +free_procname:kfree (dev_name); - free: +free:kfree (t); +out:return ; }
Signature · 1 line
1.5.3.4
Herbert Xu
AppliedQuoted 9 lines · Pavel Emelyanov
I moved the call to
kmalloc()from the *t declaration into the code (this is confusing when a variable is initialized with the result of some call) and removed unneeded comment near the error path. Just like I did with the neigh ctl-s.Besides, I fixed the goto's and the labels - they were indented with spaces :(
Signed-off-by Pavel Emelyanov <[email protected]>
Applied to net-2.6.25. Thanks.
Signature · 4 lines
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt