[B.A.T.M.A.N.] [PATCH] batman-adv: Don't call free_netdev twice

[B.A.T.M.A.N.] [PATCH] batman-adv: Don't call free_netdev twice

[Sven Eckelmann]

Free_netdev is registered as destructor in interface_setup for every
soft_device. This destructor is automatically called from
unregister_netdev and we must not call it again for the freed
net_device.

Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
---
 batman-adv-kernelland/main.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/batman-adv-kernelland/main.c b/batman-adv-kernelland/main.c
index 51856a7..c9132c0 100644
--- a/batman-adv-kernelland/main.c
+++ b/batman-adv-kernelland/main.c
@@ -130,6 +130,9 @@ unreg_sysfs:
 	sysfs_del_meshif(soft_device);
 unreg_soft_device:
 	unregister_netdev(soft_device);
+	soft_device = NULL;
+	return -ENOMEM;
+
 free_soft_device:
 	free_netdev(soft_device);
 	soft_device = NULL;
-- 
1.7.1

[B.A.T.M.A.N.] [PATCH-maint] batman-adv: Don't call free_netdev twice

[Sven Eckelmann]

Free_netdev is registered as destructor in interface_setup for every
soft_device. This destructor is automatically called from
unregister_netdev and we must not call it again for the free'd
net_device.

Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
---
This patch is created for maint and should be applied using `git am`.
Following patches should be applied before:
 * batman-adv: Move device for icmp injection to debugfs
 * batman-adv: Move tables from sysfs to debugfs
 * batman-adv: Call unregister_netdev on failures to get rtnl lock

 main.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/main.c b/main.c
index 6e6d925..6c6df6b 100644
--- a/main.c
+++ b/main.c
@@ -138,6 +138,9 @@ unreg_sysfs:
 	sysfs_del_meshif(soft_device);
 unreg_soft_device:
 	unregister_netdev(soft_device);
+	soft_device = NULL;
+	return -ENOMEM;
+
 free_soft_device:
 	free_netdev(soft_device);
 	soft_device = NULL;
-- 
1.7.1

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: Don't call free_netdev twice

[Marek Lindner]

On Wednesday 19 May 2010 22:02:02 Sven Eckelmann wrote:
> Free_netdev is registered as destructor in interface_setup for every
> soft_device. This destructor is automatically called from
> unregister_netdev and we must not call it again for the freed
> net_device.

Applied in rev 1665.

Thanks,
Marek

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: Don't call free_netdev twice

[Marek Lindner]

On Friday 21 May 2010 18:56:08 Marek Lindner wrote:
> On Wednesday 19 May 2010 22:02:02 Sven Eckelmann wrote:
> > Free_netdev is registered as destructor in interface_setup for every
> > soft_device. This destructor is automatically called from
> > unregister_netdev and we must not call it again for the freed
> > net_device.
> 
> Applied in rev 1665.

Sorry, revision 1666.

Cheers,
Marek