B.A.T.M.A.N September 2008

b.a.t.m.a.n@lists.open-mesh.org

7 participants
22 discussions

[B.A.T.M.A.N.] [PATCHv2] Move more linux 2.6 compat stuff to compat26.h
by Sven Eckelmann 25 Sep '08

25 Sep '08

--- batman/linux/modules/compat26.h | 12 ++++++++++++ batman/linux/modules/gateway.c | 8 -------- batman/linux/modules/mod_batman.c | 22 ++-------------------- 3 files changed, 14 insertions(+), 28 deletions(-) diff --git a/batman/linux/modules/compat26.h b/batman/linux/modules/compat26.h index a95b229..f1fdc67 100644 --- a/batman/linux/modules/compat26.h +++ b/batman/linux/modules/compat26.h @@ -31,6 +31,7 @@ static inline struct iphdr *ip_hdr(const struct sk_buff *skb) { return (struct iphdr *)skb_network_header(skb); } + #endif /* KERNEL_VERSION(2, 6, 22) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) @@ -39,4 +40,15 @@ static inline int kernel_bind(struct socket *sock, struct sockaddr *addr, int ad { return sock->ops->bind(sock, addr, addrlen); } + #endif /* KERNEL_VERSION(2, 6, 19) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) + +#define device_create_drvdata \ + class_device_create + +#define device_destroy \ + class_device_destroy + +#endif /* KERNEL_VERSION(2,6,26) */ diff --git a/batman/linux/modules/gateway.c b/batman/linux/modules/gateway.c index 965f87b..154497e 100644 --- a/batman/linux/modules/gateway.c +++ b/batman/linux/modules/gateway.c @@ -91,11 +91,7 @@ int init_module() if ( IS_ERR( batman_class ) ) DBG( "could not register class 'batgat'" ); else -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25) device_create_drvdata(batman_class, NULL, MKDEV(Major, 0), NULL, "batgat"); -#else - class_device_create(batman_class, NULL, MKDEV(Major, 0), NULL, "batgat"); -#endif DBG( "batgat loaded %s", strlen(REVISION_VERSION) > 3 ? REVISION_VERSION : "" ); @@ -120,11 +116,7 @@ void cleanup_module() struct free_client_data *entry, *next; struct gw_client *gw_client; -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25) device_destroy( batman_class, MKDEV( Major, 0 ) ); -#else - class_device_destroy( batman_class, MKDEV( Major, 0 ) ); -#endif class_destroy( batman_class ); /* Unregister the device */ diff --git a/batman/linux/modules/mod_batman.c b/batman/linux/modules/mod_batman.c index d34b05e..1b9ecda 100644 --- a/batman/linux/modules/mod_batman.c +++ b/batman/linux/modules/mod_batman.c @@ -50,6 +50,8 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) #include <linux/devfs_fs_kernel.h> #else +#include "compat26.h" + static struct class *batman_class; #endif @@ -117,11 +119,7 @@ int init_module( void ) { if ( IS_ERR(batman_class) ) printk( "B.A.T.M.A.N.: Could not register class 'batman' \n" ); else -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25) device_create_drvdata( batman_class, NULL, MKDEV( Major, 0 ), NULL, "batman" ); -#else - class_device_create( batman_class, NULL, MKDEV( Major, 0 ), NULL, "batman" ); -#endif #endif for ( i = 0; i < 255; i++ ) { @@ -143,11 +141,7 @@ void cleanup_module( void ) { #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) devfs_remove( "batman", 0 ); #else -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25) device_destroy_drvdata( batman_class, MKDEV( Major, 0 ) ); -#else - class_device_destroy( batman_class, MKDEV( Major, 0 ) ); -#endif class_destroy( batman_class ); #endif @@ -247,11 +241,7 @@ static int device_release( struct inode *inode, struct file *file ) { #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) devfs_remove( "batman", minor_num ); #else -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25) device_destroy(minor->minor_class, MKDEV(Major, minor_num)); -#else - class_device_destroy( minor->minor_class, MKDEV( Major, minor_num ) ); -#endif class_destroy( minor->minor_class ); #endif sock_release( minor->raw_sock ); @@ -367,11 +357,7 @@ static int device_ioctl( struct inode *inode, struct file *file, unsigned int cm if ( IS_ERR(minor->minor_class) ) printk( "B.A.T.M.A.N.: Could not register class '%s' \n", filename ); else -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25) device_create_drvdata( minor->minor_class, NULL, MKDEV( Major, minor_num ), NULL, "batman%d", minor_num ); -#else - class_device_create( minor->minor_class, NULL, MKDEV( Major, minor_num ), NULL, "batman%d", minor_num ); -#endif #endif /* let udev create the device file */ set_current_state(TASK_INTERRUPTIBLE); @@ -395,11 +381,7 @@ static int device_ioctl( struct inode *inode, struct file *file, unsigned int cm #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) devfs_remove( "batman", minor_num ); #else -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25) device_destroy( minor->minor_class, MKDEV(Major, minor_num )); -#else - class_device_destroy( minor->minor_class, MKDEV(Major, minor_num )); -#endif class_destroy( minor->minor_class ); #endif kfree( minor ); -- 1.6.0.1

1 0

[B.A.T.M.A.N.] [PATCH] Move more linux 2.6 compat stuff to compat26.h
by Sven Eckelmann 25 Sep '08

25 Sep '08

--- batman/linux/modules/gateway.c | 8 -------- batman/linux/modules/mod_batman.c | 22 ++-------------------- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/batman/linux/modules/gateway.c b/batman/linux/modules/gateway.c index 965f87b..154497e 100644 --- a/batman/linux/modules/gateway.c +++ b/batman/linux/modules/gateway.c @@ -91,11 +91,7 @@ int init_module() if ( IS_ERR( batman_class ) ) DBG( "could not register class 'batgat'" ); else -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25) device_create_drvdata(batman_class, NULL, MKDEV(Major, 0), NULL, "batgat"); -#else - class_device_create(batman_class, NULL, MKDEV(Major, 0), NULL, "batgat"); -#endif DBG( "batgat loaded %s", strlen(REVISION_VERSION) > 3 ? REVISION_VERSION : "" ); @@ -120,11 +116,7 @@ void cleanup_module() struct free_client_data *entry, *next; struct gw_client *gw_client; -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25) device_destroy( batman_class, MKDEV( Major, 0 ) ); -#else - class_device_destroy( batman_class, MKDEV( Major, 0 ) ); -#endif class_destroy( batman_class ); /* Unregister the device */ diff --git a/batman/linux/modules/mod_batman.c b/batman/linux/modules/mod_batman.c index d34b05e..1b9ecda 100644 --- a/batman/linux/modules/mod_batman.c +++ b/batman/linux/modules/mod_batman.c @@ -50,6 +50,8 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) #include <linux/devfs_fs_kernel.h> #else +#include "compat26.h" + static struct class *batman_class; #endif @@ -117,11 +119,7 @@ int init_module( void ) { if ( IS_ERR(batman_class) ) printk( "B.A.T.M.A.N.: Could not register class 'batman' \n" ); else -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25) device_create_drvdata( batman_class, NULL, MKDEV( Major, 0 ), NULL, "batman" ); -#else - class_device_create( batman_class, NULL, MKDEV( Major, 0 ), NULL, "batman" ); -#endif #endif for ( i = 0; i < 255; i++ ) { @@ -143,11 +141,7 @@ void cleanup_module( void ) { #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) devfs_remove( "batman", 0 ); #else -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25) device_destroy_drvdata( batman_class, MKDEV( Major, 0 ) ); -#else - class_device_destroy( batman_class, MKDEV( Major, 0 ) ); -#endif class_destroy( batman_class ); #endif @@ -247,11 +241,7 @@ static int device_release( struct inode *inode, struct file *file ) { #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) devfs_remove( "batman", minor_num ); #else -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25) device_destroy(minor->minor_class, MKDEV(Major, minor_num)); -#else - class_device_destroy( minor->minor_class, MKDEV( Major, minor_num ) ); -#endif class_destroy( minor->minor_class ); #endif sock_release( minor->raw_sock ); @@ -367,11 +357,7 @@ static int device_ioctl( struct inode *inode, struct file *file, unsigned int cm if ( IS_ERR(minor->minor_class) ) printk( "B.A.T.M.A.N.: Could not register class '%s' \n", filename ); else -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25) device_create_drvdata( minor->minor_class, NULL, MKDEV( Major, minor_num ), NULL, "batman%d", minor_num ); -#else - class_device_create( minor->minor_class, NULL, MKDEV( Major, minor_num ), NULL, "batman%d", minor_num ); -#endif #endif /* let udev create the device file */ set_current_state(TASK_INTERRUPTIBLE); @@ -395,11 +381,7 @@ static int device_ioctl( struct inode *inode, struct file *file, unsigned int cm #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) devfs_remove( "batman", minor_num ); #else -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25) device_destroy( minor->minor_class, MKDEV(Major, minor_num )); -#else - class_device_destroy( minor->minor_class, MKDEV(Major, minor_num )); -#endif class_destroy( minor->minor_class ); #endif kfree( minor ); -- 1.6.0.1

1 1

[B.A.T.M.A.N.] [PATCH] Backport gateway module to 2.6.18
by Sven Eckelmann 24 Sep '08

24 Sep '08

kernel_bind and other kernel socket api functions were defined by linux v2.6.18-310-gac5a488 and ip_hdr first appeared in linux v2.6.21-122-geddc9ec. To provide these functions a new compatibility header file with the name compat26.h was added to provide an easy way to support older kernels. Other "#if LINUX_VERSION_CODE" should be copied into this file. --- batman/linux/modules/compat26.h | 42 +++++++++++++++++++++++++++++++++++++++ batman/linux/modules/gateway.c | 1 + 2 files changed, 43 insertions(+), 0 deletions(-) create mode 100644 batman/linux/modules/compat26.h diff --git a/batman/linux/modules/compat26.h b/batman/linux/modules/compat26.h new file mode 100644 index 0000000..a95b229 --- /dev/null +++ b/batman/linux/modules/compat26.h @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2008 BATMAN contributors: + * Thomas Lopatic, Corinna 'Elektra' Aichele, Axel Neumann, Marek Lindner, Andreas Langer + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#include <linux/version.h> /* LINUX_VERSION_CODE */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22) + +#define skb_network_header(_skb) \ + ((_skb)->nh.raw) + +static inline struct iphdr *ip_hdr(const struct sk_buff *skb) +{ + return (struct iphdr *)skb_network_header(skb); +} +#endif /* KERNEL_VERSION(2, 6, 22) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) + +static inline int kernel_bind(struct socket *sock, struct sockaddr *addr, int addrlen) +{ + return sock->ops->bind(sock, addr, addrlen); +} +#endif /* KERNEL_VERSION(2, 6, 19) */ diff --git a/batman/linux/modules/gateway.c b/batman/linux/modules/gateway.c index 7272c50..965f87b 100644 --- a/batman/linux/modules/gateway.c +++ b/batman/linux/modules/gateway.c @@ -19,6 +19,7 @@ #include "gateway.h" #include "hash.h" +#include "compat26.h" static struct class *batman_class; -- 1.6.0.1

1 0

[B.A.T.M.A.N.] Batmand dies
by Gustavo Lindberg 14 Sep '08

14 Sep '08

I just tried the last openwrt-kamikaze trunk with the svn v1109 of batman on ubnt NS2. Batmand die as follows: root@OpenWrt:~# batmand -d 4 -g 5000 ath2 WARNING: You are using the unstable batman branch. If you are interested in *using* batman get the latest stable release ! Interface activated: ath2 Using interface ath2 with address 5.0.0.1 and broadcast address 5.255.255.255 B.A.T.M.A.N. 0.3-beta (compatibility version 5) [ 80] Error - can't set IFFLAGS for gate0: Cannot assign requested address [ 80] Error - can't set IFFLAGS for gate0: Cannot assign requested address dmesg output: Atheros HAL provided by OpenWrt, DD-WRT and MakSat Technologies wifi0: 11b rates: 1Mbps 2Mbps 5.5Mbps 11Mbps wifi0: 11g rates: 1Mbps 2Mbps 5.5Mbps 11Mbps 6Mbps 9Mbps 12Mbps 18Mbps 24Mbps 36Mbps 48Mbps 54Mbps wifi0: H/W encryption support: WEP AES AES_CCM TKIP ath_ahb: wifi0: Atheros 2315 WiSoC: mem=0xb0000000, irq=3 gpio-buttons driver version 0.1.1 batgat: [batgat_ioctl:224] name gate0 index 7 batgat: [batgat_ioctl:244] disconnect daemon batgat: [packet_recv_thread:508] thread stop batgat: [batgat_ioctl:256] thread shutdown batgat: [batgat_ioctl:263] gate shutdown batgat: [batgat_ioctl:277] device unregistered successfully batgat: [batgat_ioctl:224] name gate0 index 8 batgat: [batgat_ioctl:244] disconnect daemon batgat: [packet_recv_thread:508] thread stop batgat: [batgat_ioctl:256] thread shutdown batgat: [batgat_ioctl:263] gate shutdown batgat: [batgat_ioctl:277] device unregistered successfully batgat: [batgat_ioctl:224] name gate0 index 9 batgat: [batgat_ioctl:244] disconnect daemon batgat: [packet_recv_thread:508] thread stop batgat: [batgat_ioctl:256] thread shutdown batgat: [batgat_ioctl:263] gate shutdown batgat: [batgat_ioctl:277] device unregistered successfully batgat: [batgat_ioctl:224] name gate0 index 10 batgat: [batgat_ioctl:244] disconnect daemon batgat: [packet_recv_thread:508] thread stop batgat: [batgat_ioctl:256] thread shutdown batgat: [batgat_ioctl:263] gate shutdown batgat: [batgat_ioctl:277] device unregistered successfully root@OpenWrt:~# No iptables rules at all. All policy ACCEPT. BATGAT dont crash anymore, Greetings. Gustavo.

3 2

[B.A.T.M.A.N.] [PATCH] Make batman debug allocation function thread safe
by Sven Eckelmann 12 Sep '08

12 Sep '08

Different list structures are manually managed inside the debug malloc functions of batman. When different threads try to allocate and free memory it is possible that lists get corrupted and we get a segfault. Also the memory usage pointer can hold a wrong value and removeMemory could stop batman without any real reason. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batman/allocate.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/batman/allocate.c b/batman/allocate.c index d51bec0..c845431 100644 --- a/batman/allocate.c +++ b/batman/allocate.c @@ -31,6 +31,8 @@ #if defined DEBUG_MALLOC +static pthread_mutex_t chunk_mutex = PTHREAD_MUTEX_INITIALIZER; + struct chunkHeader *chunkList = NULL; struct chunkHeader @@ -51,6 +53,7 @@ struct chunkTrailer #if defined MEMORY_USAGE struct memoryUsage *memoryList = NULL; +static pthread_mutex_t memory_mutex = PTHREAD_MUTEX_INITIALIZER; struct memoryUsage @@ -66,7 +69,7 @@ void addMemory( uint32_t length, int32_t tag ) { struct memoryUsage *walker; - + pthread_mutex_lock(&memory_mutex); for ( walker = memoryList; walker != NULL; walker = walker->next ) { if ( walker->tag == tag ) { @@ -90,6 +93,7 @@ void addMemory( uint32_t length, int32_t tag ) { memoryList = walker; } + pthread_mutex_unlock(&memory_mutex); } @@ -98,7 +102,7 @@ void removeMemory( int32_t tag, int32_t freetag ) { struct memoryUsage *walker; - + pthread_mutex_lock(&memory_mutex); for ( walker = memoryList; walker != NULL; walker = walker->next ) { if ( walker->tag == tag ) { @@ -106,6 +110,7 @@ void removeMemory( int32_t tag, int32_t freetag ) { if ( walker->counter == 0 ) { debug_output( 0, "Freeing more memory than was allocated: malloc tag = %d, free tag = %d\n", tag, freetag ); + pthread_mutex_unlock(&memory_mutex); restore_and_exit(0); } @@ -120,9 +125,11 @@ void removeMemory( int32_t tag, int32_t freetag ) { if ( walker == NULL ) { debug_output( 0, "Freeing memory that was never allocated: malloc tag = %d, free tag = %d\n", tag, freetag ); + pthread_mutex_unlock(&memory_mutex); restore_and_exit(0); } + pthread_mutex_unlock(&memory_mutex); } @@ -143,21 +150,25 @@ void checkIntegrity(void) debug_output( 5, " \nMemory usage information:\n" ); + pthread_mutex_lock(&memory_mutex); for ( memoryWalker = memoryList; memoryWalker != NULL; memoryWalker = memoryWalker->next ) { if ( memoryWalker->counter != 0 ) debug_output( 5, " tag: %''4i, num malloc: %4i, bytes per malloc: %''4i, total: %6i\n", memoryWalker->tag, memoryWalker->counter, memoryWalker->length, memoryWalker->counter * memoryWalker->length ); } + pthread_mutex_unlock(&memory_mutex); #endif + pthread_mutex_lock(&chunk_mutex); for (walker = chunkList; walker != NULL; walker = walker->next) { if (walker->magicNumber != MAGIC_NUMBER) { debug_output( 0, "checkIntegrity - invalid magic number in header: %08x, malloc tag = %d\n", walker->magicNumber, walker->tag ); + pthread_mutex_unlock(&chunk_mutex); restore_and_exit(0); } @@ -168,17 +179,23 @@ void checkIntegrity(void) if (chunkTrailer->magicNumber != MAGIC_NUMBER) { debug_output( 0, "checkIntegrity - invalid magic number in trailer: %08x, malloc tag = %d\n", chunkTrailer->magicNumber, walker->tag ); + pthread_mutex_unlock(&chunk_mutex); restore_and_exit(0); } } + + pthread_mutex_unlock(&chunk_mutex); } void checkLeak(void) { struct chunkHeader *walker; + pthread_mutex_lock(&chunk_mutex); for (walker = chunkList; walker != NULL; walker = walker->next) debug_output( 0, "Memory leak detected, malloc tag = %d\n", walker->tag ); + + pthread_mutex_unlock(&chunk_mutex); } void *debugMalloc(uint32_t length, int32_t tag) @@ -208,8 +225,10 @@ void *debugMalloc(uint32_t length, int32_t tag) chunkTrailer->magicNumber = MAGIC_NUMBER; + pthread_mutex_lock(&chunk_mutex); chunkHeader->next = chunkList; chunkList = chunkHeader; + pthread_mutex_unlock(&chunk_mutex); #if defined MEMORY_USAGE @@ -282,6 +301,7 @@ void debugFree(void *memoryParameter, int tag) previous = NULL; + pthread_mutex_lock(&chunk_mutex); for (walker = chunkList; walker != NULL; walker = walker->next) { if (walker == chunkHeader) @@ -293,6 +313,7 @@ void debugFree(void *memoryParameter, int tag) if (walker == NULL) { debug_output( 0, "Double free detected, malloc tag = %d, free tag = %d\n", chunkHeader->tag, tag ); + pthread_mutex_unlock(&chunk_mutex); restore_and_exit(0); } @@ -302,6 +323,8 @@ void debugFree(void *memoryParameter, int tag) else previous->next = walker->next; + pthread_mutex_unlock(&chunk_mutex); + chunkTrailer = (struct chunkTrailer *)(memory + chunkHeader->length); if (chunkTrailer->magicNumber != MAGIC_NUMBER) -- 1.6.0.1

1 0

[B.A.T.M.A.N.] [PATCH] Don't validate hardware address of batgat gate0 device
by Sven Eckelmann 12 Sep '08

12 Sep '08

linux v2.6.24-rc1-1-gbada339 introduces a check for valid ethernet mac address. We don't have such a valid one because it is just a virtual gateway device which doesn't need such thing. To disable the eth_validate_addr check we can override the function pointer inside the netdevice structure or just setting it to NULL to disable it at all. --- batman/linux/modules/gateway.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/batman/linux/modules/gateway.c b/batman/linux/modules/gateway.c index d7af197..11693e2 100644 --- a/batman/linux/modules/gateway.c +++ b/batman/linux/modules/gateway.c @@ -527,6 +527,9 @@ static void bat_netdev_setup( struct net_device *dev ) #endif dev->mtu = 1471; dev->flags = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST; +#ifdef HAVE_VALIDATE_ADDR + dev->validate_addr = NULL; +#endif priv = netdev_priv( dev ); memset( priv, 0, sizeof( struct gate_priv ) ); -- 1.6.0.1

2 1

[B.A.T.M.A.N.] BATGAT
by Gustavo Lindberg 12 Sep '08

12 Sep '08

Hi all ! How to disable batgat ? It necessary recompiling batmand or is enough to unload batgat module ? I do that and batmand load but the gw never more assign ip trough the tunnel iface.... TIA

5 8

[B.A.T.M.A.N.] Batman never stabilizes a route for nodes
by Outback Dingo 12 Sep '08

12 Sep '08

Batmand never established a stable route for clients, ie. they never get reliable internet, actually to be honest, they get 0 internet cause routing always loops Scenerio 30 nodes, 5 gateways, OpenWRT Trunk Batman ver 1105 batman gateway client expired http://pastebin.com/m1677070a i also found this thread from before showing a similiar issue https://list.open-mesh.net/pipermail/b.a.t.m.a.n/2007-September/000277.html question is how do i get the routes to stabilize so the mesh functions

2 3

[B.A.T.M.A.N.] [PATCH] Remove batgat proc entries correctly
by Sven Eckelmann 12 Sep '08

12 Sep '08

We must remove the /proc/net/batgat/clients file and /proc/net/batgat dir correctly or otherwise we will get a oops when someone tries to access the file. If we do not remove the directory it is possible that more then one batgat entry appears inside of /proc/net/ Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batman/linux/modules/gateway.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/batman/linux/modules/gateway.c b/batman/linux/modules/gateway.c index e90be0b..d7af197 100644 --- a/batman/linux/modules/gateway.c +++ b/batman/linux/modules/gateway.c @@ -769,8 +769,16 @@ int choose_vip(void *data, int32_t size) static void cleanup_procfs(void) { - if(clients_file) remove_proc_entry("PROC_FILE_CLIENTS", proc_dir); - if(proc_dir) remove_proc_entry(PROC_ROOT_DIR, NULL); + if (clients_file) + remove_proc_entry(PROC_FILE_CLIENTS, proc_dir); + +#ifdef __NET_NET_NAMESPACE_H + if (proc_dir) + remove_proc_entry(PROC_ROOT_DIR, init_net.proc_net); +#else + if (proc_dir) + remove_proc_entry(PROC_ROOT_DIR, proc_net); +#endif } static int setup_procfs(void) -- 1.6.0.1

2 1

[B.A.T.M.A.N.] [PATCH] kfree list nodes after deleting them from free_client_list in batgat
by Sven Eckelmann 11 Sep '08

11 Sep '08

list_del will only move the next pointer of the previous entry to the next entry and the do the same with the previous pointer of the next entry. The entry itself will not be touched. We allocated new memory for the list entry so we must free them or otherwise we would only leak memory and run out of it after enough connecting and leaving clients. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batman/linux/modules/gateway.c | 3 +++ batman/linux/modules/gateway24.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/batman/linux/modules/gateway.c b/batman/linux/modules/gateway.c index 5786be8..e90be0b 100644 --- a/batman/linux/modules/gateway.c +++ b/batman/linux/modules/gateway.c @@ -148,6 +148,7 @@ void cleanup_module() if(entry->gw_client != NULL) { gw_client = entry->gw_client; list_del(&entry->list); + kfree(entry); kfree(gw_client); } @@ -267,6 +268,7 @@ static int batgat_ioctl( struct inode *inode, struct file *file, unsigned int cm if(entry->gw_client) { gw_client = entry->gw_client; list_del(&entry->list); + kfree(entry); kfree(gw_client); } @@ -653,6 +655,7 @@ static struct gw_client *get_ip_addr(struct sockaddr_in *client_addr) DBG("use free client from list"); gw_client = entry->gw_client; list_del(&entry->list); + kfree(entry); break; } diff --git a/batman/linux/modules/gateway24.c b/batman/linux/modules/gateway24.c index 44dfc0e..585fe85 100644 --- a/batman/linux/modules/gateway24.c +++ b/batman/linux/modules/gateway24.c @@ -129,6 +129,7 @@ void cleanup_module() if(entry->gw_client != NULL) { gw_client = entry->gw_client; list_del(&entry->list); + kfree(entry); kfree(gw_client); } @@ -251,6 +252,7 @@ static int batgat_ioctl( struct inode *inode, struct file *file, unsigned int cm gw_client = entry->gw_client; list_del(&entry->list); + kfree(entry); kfree(gw_client); } @@ -595,6 +597,7 @@ static struct gw_client *get_ip_addr(struct sockaddr_in *client_addr) printk(KERN_DEBUG "use free client from list"); gw_client = entry->gw_client; list_del(&entry->list); + kfree(entry); break; } -- 1.6.0.1

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N September 2008