B.A.T.M.A.N February 2013

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

12 participants
21 discussions

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Fix broadcast+ogm queue purging race condition
by Linus Lüssing 22 Jul '16

22 Jul '16

So far on purging broadcast and ogm queues we temporarily give up the spin lock of these queues to be able to cancel any scheduled forwarding work. However this is unsafe and can lead to a general protection error in batadv_purge_outstanding_packets(). With this patch we split the queue purging into two steps: First removing forward packets from those queues and signaling the cancelation. Secondly, we are actively canceling any scheduled forwarding, wait for any running forwarding to finish and only free a forw_packet afterwards. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- Fixes issue #168 send.c | 117 ++++++++++++++++++++++++++++++++++++++------------------------- types.h | 1 + 2 files changed, 71 insertions(+), 47 deletions(-) diff --git a/send.c b/send.c index 0a0bb45..f93476b 100644 --- a/send.c +++ b/send.c @@ -245,6 +245,10 @@ static void batadv_send_outstanding_bcast_packet(struct work_struct *work) bat_priv = netdev_priv(soft_iface); spin_lock_bh(&bat_priv->forw_bcast_list_lock); + if (hlist_unhashed(&forw_packet->list)) { + spin_unlock_bh(&bat_priv->forw_bcast_list_lock); + return; + } hlist_del(&forw_packet->list); spin_unlock_bh(&bat_priv->forw_bcast_list_lock); @@ -293,6 +297,10 @@ void batadv_send_outstanding_bat_ogm_packet(struct work_struct *work) delayed_work); bat_priv = netdev_priv(forw_packet->if_incoming->soft_iface); spin_lock_bh(&bat_priv->forw_bat_list_lock); + if (hlist_unhashed(&forw_packet->list)) { + spin_unlock_bh(&bat_priv->forw_bat_list_lock); + return; + } hlist_del(&forw_packet->list); spin_unlock_bh(&bat_priv->forw_bat_list_lock); @@ -316,13 +324,68 @@ out: batadv_forw_packet_free(forw_packet); } +/** + * batadv_cancel_packets - Cancels a list of forward packets + * @forw_list: The to be canceled forward packets + * @canceled_list: The backup list. + * + * This canceles any scheduled forwarding packet tasks in the provided + * forw_list. The packets are being moved from the forw_list to the + * canceled_list afterwards to unhash the forward packet list pointer, + * allowing any already running task to notice the cancelation. + */ +static void batadv_cancel_packets(struct hlist_head *forw_list, + struct hlist_head *canceled_list, + const struct batadv_hard_iface *hard_iface) +{ + struct batadv_forw_packet *forw_packet; + struct hlist_node *tmp_node, *safe_tmp_node; + + hlist_for_each_entry_safe(forw_packet, tmp_node, safe_tmp_node, + forw_list, list) { + /* if purge_outstanding_packets() was called with an argument + * we delete only packets belonging to the given interface + */ + if ((hard_iface) && + (forw_packet->if_incoming != hard_iface)) + continue; + + hlist_del_init(&forw_packet->list); + hlist_add_head(&forw_packet->canceled_list, canceled_list); + } +} + +/** + * batadv_canceled_packets_free - Frees canceled forward packets + * @head: A list of to be freed forw_packets + * + * This function canceles the scheduling of any packet in the provided list, + * waits for any possibly running packet forwarding thread to finish and + * finally, safely frees this forward packet. + * + * This function might sleep. + */ +static void batadv_canceled_packets_free(struct hlist_head *head) +{ + struct batadv_forw_packet *forw_packet; + struct hlist_node *tmp_node, *safe_tmp_node; + + hlist_for_each_entry_safe(forw_packet, tmp_node, safe_tmp_node, head, + canceled_list) { + cancel_delayed_work_sync(&forw_packet->delayed_work); + + hlist_del(&forw_packet->canceled_list); + batadv_forw_packet_free(forw_packet); + } +} + void batadv_purge_outstanding_packets(struct batadv_priv *bat_priv, const struct batadv_hard_iface *hard_iface) { - struct batadv_forw_packet *forw_packet; - struct hlist_node *tmp_node, *safe_tmp_node; - bool pending; + struct hlist_head head; + + INIT_HLIST_HEAD(&head); if (hard_iface) batadv_dbg(BATADV_DBG_BATMAN, bat_priv, @@ -334,53 +397,13 @@ batadv_purge_outstanding_packets(struct batadv_priv *bat_priv, /* free bcast list */ spin_lock_bh(&bat_priv->forw_bcast_list_lock); - hlist_for_each_entry_safe(forw_packet, tmp_node, safe_tmp_node, - &bat_priv->forw_bcast_list, list) { - /* if purge_outstanding_packets() was called with an argument - * we delete only packets belonging to the given interface - */ - if ((hard_iface) && - (forw_packet->if_incoming != hard_iface)) - continue; - - spin_unlock_bh(&bat_priv->forw_bcast_list_lock); - - /* batadv_send_outstanding_bcast_packet() will lock the list to - * delete the item from the list - */ - pending = cancel_delayed_work_sync(&forw_packet->delayed_work); - spin_lock_bh(&bat_priv->forw_bcast_list_lock); - - if (pending) { - hlist_del(&forw_packet->list); - batadv_forw_packet_free(forw_packet); - } - } + batadv_cancel_packets(&bat_priv->forw_bcast_list, &head, hard_iface); spin_unlock_bh(&bat_priv->forw_bcast_list_lock); /* free batman packet list */ spin_lock_bh(&bat_priv->forw_bat_list_lock); - hlist_for_each_entry_safe(forw_packet, tmp_node, safe_tmp_node, - &bat_priv->forw_bat_list, list) { - /* if purge_outstanding_packets() was called with an argument - * we delete only packets belonging to the given interface - */ - if ((hard_iface) && - (forw_packet->if_incoming != hard_iface)) - continue; - - spin_unlock_bh(&bat_priv->forw_bat_list_lock); - - /* send_outstanding_bat_packet() will lock the list to - * delete the item from the list - */ - pending = cancel_delayed_work_sync(&forw_packet->delayed_work); - spin_lock_bh(&bat_priv->forw_bat_list_lock); - - if (pending) { - hlist_del(&forw_packet->list); - batadv_forw_packet_free(forw_packet); - } - } + batadv_cancel_packets(&bat_priv->forw_bat_list, &head, hard_iface); spin_unlock_bh(&bat_priv->forw_bat_list_lock); + + batadv_canceled_packets_free(&head); } diff --git a/types.h b/types.h index aba8364..f62a35f 100644 --- a/types.h +++ b/types.h @@ -853,6 +853,7 @@ struct batadv_skb_cb { */ struct batadv_forw_packet { struct hlist_node list; + struct hlist_node canceled_list; unsigned long send_time; uint8_t own; struct sk_buff *skb; -- 1.7.10.4

4 12

[B.A.T.M.A.N.] Classes and purposed classes (problem to solve)
by cmsv 16 Nov '15

16 Nov '15

Scenario: I have recently moved 13 nodes previously using wds to batman-adv. One problem that i am encountering is the gateway selection and its actually defectiveness. This problem has be seen when the client nodes are set on class 20. The node clients in fact select the gateways that advertise better link quality usually above 200 but at the same time some clients end up connecting to a gateway that is either too slow or unusable either due to routing or other factors such as distance and even clear visibility. In one case the node connects to something that defies logic. I thought about ways to work around this and came up with an idea that may help which means the creation of 2 new classes. - Preferred gateway fall-back - Preferred fixed gateway For Preferred gateway fall-back: consider the gateway's advertised quality towards the gateway and stick with the selection until the gateway disappears returning to it soon as it returns regardless of any other data. - Preferred fixed gateway Manual gateway selection by the node owner or admin. (wds type) If these classes cannot be created; maybe a plugin of some sort could be. could be called "gordon". I understand that this idea may sound useless the same way blocking originators may be for someone but in some scenarios just like blocking originators it look to me very valid. My current problem is that the link quality seems to go up and down like a roller coaster in a specific order which causes the clients to switch constantly sometimes many times per hour. While this does not seem to be an issue for most client nodes; for 2 of them it means no internet access at all. The solution for now seems to be having these 2 nodes forced to use 1 specific gateway. I am quite open to any ideas that may help resolve this issue that has been casing some "uninformed people" to become headaches. -- Redes wireless http://wirelesspt.net

3 2

[B.A.T.M.A.N.] [PATCH] batman-adv: change compat code to remove sparse warning
by Simon Wunderlich 01 Mar '13

01 Mar '13

The latest compat patch fixing rtnl ops compile errors from 2.6.32 ("batman-adv: add compat support for the new netlink ops") fixes the compilation, but leaves some sparse errors: batman-adv/soft-interface.c:573:10: warning: Initializer entry defined twice batman-adv/soft-interface.c:574:10: also defined here This patch uses another approach by moving the initializers in a dummy struct instead. This also removes the sparse errors. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> --- compat.h | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/compat.h b/compat.h index 64244ac..69c3dc2 100644 --- a/compat.h +++ b/compat.h @@ -135,23 +135,19 @@ static inline int batadv_param_set_copystring(const char *val, #define kstrtoul strict_strtoul #define kstrtol strict_strtol -#define batadv_softif_slave_add(x, y) \ -batadv_softif_slave_add(struct net_device *dev, struct ifreq *rq, int cmd)\ -{\ - return -EOPNOTSUPP;\ -}\ -static int __attribute__((unused)) __batadv_softif_slave_add(x, y) - -#define batadv_softif_slave_del(x, y) \ -__batadv_softif_slave_del(struct net_device *dev, struct net_device *slave_dev);\ -static int batadv_softif_slave_del(struct net_device *dev, struct ifreq *rq, int cmd)\ -{\ - return -EOPNOTSUPP;\ -}\ -static int __attribute__((unused)) __batadv_softif_slave_del(x, y) - -#define ndo_add_slave ndo_do_ioctl -#define ndo_del_slave ndo_do_ioctl +/* Hack for removing ndo_add/del_slave at the end of net_device_ops. + * This is somewhat ugly because it requires that ndo_validate_addr + * is at the end of this struct in soft-interface.c. + */ +#define ndo_validate_addr \ + ndo_validate_addr = eth_validate_addr, \ +}; \ +static const struct { \ + void *ndo_validate_addr; \ + void *ndo_add_slave; \ + void *ndo_del_slave; \ +} __attribute__((unused)) __useless_ops1 = { \ + .ndo_validate_addr #endif /* < KERNEL_VERSION(2, 6, 39) */ -- 1.7.10.4

3 2

[B.A.T.M.A.N.] [PATCHv3 1/2] batman-adv: free an hard-interface before adding it
by Antonio Quartulli 27 Feb '13

27 Feb '13

When adding a new hard interface (e.h. wlan0) to a soft interface (e.g. bat0) and the former is already enslaved in another virtual interface (e.g. a software bridge) batman-adv has to free the it first and then continue with the adding mechanism. In this way the behaviour becomes consistent with what "ip link set master" does. At the moment batman-adv enslaves the hard interface without checking for the master device, possibly causing strange behaviours which are never wanted by the users. Reported-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- v2: - added compat code for netdev_master_upper_dev_get() v3: - use #define instead of a static inline function in compat code compat.h | 5 +++++ hard-interface.c | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/compat.h b/compat.h index 425b3d9..885e551 100644 --- a/compat.h +++ b/compat.h @@ -214,6 +214,11 @@ static int __batadv_interface_set_mac_addr(x, y) #define netdev_master_upper_dev_link netdev_set_master #define netdev_upper_dev_unlink(slave, master) netdev_set_master(slave, NULL) +#define netdev_master_upper_dev_get(dev) \ +({\ + ASSERT_RTNL();\ + dev->master;\ +}) #endif /* < KERNEL_VERSION(3, 9, 0) */ diff --git a/hard-interface.c b/hard-interface.c index c08e39e..fd99e42 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -311,7 +311,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, const char *iface_name) { struct batadv_priv *bat_priv; - struct net_device *soft_iface; + struct net_device *soft_iface, *master; __be16 ethertype = __constant_htons(ETH_P_BATMAN); int ret; @@ -321,11 +321,6 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, if (!atomic_inc_not_zero(&hard_iface->refcount)) goto out; - /* hard-interface is part of a bridge */ - if (hard_iface->net_dev->priv_flags & IFF_BRIDGE_PORT) - pr_err("You are about to enable batman-adv on '%s' which already is part of a bridge. Unless you know exactly what you are doing this is probably wrong and won't work the way you think it would.\n", - hard_iface->net_dev->name); - soft_iface = dev_get_by_name(&init_net, iface_name); if (!soft_iface) { @@ -347,6 +342,13 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, goto err_dev; } + /* check if the interface is enslaved in another virtual one and + * in that case unlink it first + */ + master = netdev_master_upper_dev_get(hard_iface->net_dev); + if (master) + netdev_upper_dev_unlink(hard_iface->net_dev, master); + hard_iface->soft_iface = soft_iface; bat_priv = netdev_priv(hard_iface->soft_iface); -- 1.8.1.2

2 6

[B.A.T.M.A.N.] [PATCH] batman-adv: add compat support for the new netlink ops
by Antonio Quartulli 27 Feb '13

27 Feb '13

This patches enable the new rtnl ops to compile on kernels starting from 2.6.32 Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- Could not be uglier. *Compile tested only* because linux-2.6.32 does not compile on my laptop compat.h | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/compat.h b/compat.h index 885e551..de22e2b 100644 --- a/compat.h +++ b/compat.h @@ -71,6 +71,9 @@ static inline void batadv_this_cpu_add(uint64_t *count_ptr, size_t count) put_cpu(); } +#define batadv_softif_destroy_netlink(dev, head) batadv_softif_destroy_netlink(dev) +#define unregister_netdevice_queue(dev, head) unregister_netdevice(dev) + #endif /* < KERNEL_VERSION(2, 6, 33) */ @@ -132,6 +135,43 @@ static inline int batadv_param_set_copystring(const char *val, #define kstrtoul strict_strtoul #define kstrtol strict_strtol +#define batadv_softif_slave_add(x, y) \ +batadv_softif_slave_add(struct net_device *dev, struct ifreq *rq, int cmd)\ +{\ + return 0;\ +}\ +static int __batadv_softif_slave_add(x, y) + +#define batadv_softif_slave_del(x, y) \ +__batadv_softif_slave_del(struct net_device *dev, struct net_device *slave_dev);\ +static int batadv_softif_slave_del(struct net_device *dev, struct ifreq *rq, int cmd)\ +{\ + struct batadv_priv *bat_priv = netdev_priv(dev);\ + struct net_device *slave_dev;\ + int ret;\ + if (!capable(CAP_NET_ADMIN))\ + return -EPERM;\ + slave_dev = dev_get_by_index(&init_net, rq->ifr_ifindex);\ + if (!dev)\ + return -EINVAL;\ + switch(cmd) {\ + case SIOCBRADDIF:\ + ret = __batadv_softif_slave_add(bat_priv->soft_iface, slave_dev);\ + case SIOCBRDELIF:\ + ret = __batadv_softif_slave_del(bat_priv->soft_iface, slave_dev);\ + default:\ + pr_debug("batman-adv does not support ioctl 0x%x\n", cmd);\ + return -EOPNOTSUPP;\ + }\ +\ + dev_put(slave_dev);\ + return ret;\ +}\ +static int __batadv_softif_slave_del(x, y) + +#define ndo_add_slave ndo_do_ioctl +#define ndo_del_slave ndo_do_ioctl + #endif /* < KERNEL_VERSION(2, 6, 39) */ -- 1.8.1.2

3 11

[B.A.T.M.A.N.] netifd batman-adv proto
by Filippo Sallemi 26 Feb '13

26 Feb '13

Hi all, I've writed a batman-adv proto in according on new netifd system of attitude adjustement release. With this script the batman-adv configuration could be moved on /etc/config/network file istead of /etc/config/batman-adv and the /lib/batman-adv/config.sh is no longer required. es. config interface mesh option proto bat option device bat0 option interfaces 'wlan0 wlan1' option gw_mode server ... if someone think that my work could be useful and can provide a better and elegant integration on openwrt please keep in touch. -- Filippo Sallemi

3 2

[B.A.T.M.A.N.] batman-adv: gpf in batadv_slide_own_bcast_window
by Sasha Levin 26 Feb '13

26 Feb '13

Hi all, While fuzzing with trinity inside a KVM tools guest running latest -next kernel I've stumbled on the following: [ 3148.615130] batman_adv: <98>\<AE><A4><C7>^?: Removing interface: eth0 [ 3148.991938] general protection fault: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC [ 3148.993736] Dumping ftrace buffer: [ 3148.997554] (ftrace buffer empty) [ 3148.998426] Modules linked in: [ 3148.999135] CPU 3 [ 3148.999606] Pid: 6, comm: kworker/u:0 Tainted: G W 3.8.0-next-20130222-sasha-00038-gba27e20-dirty #11 [ 3149.001223] RIP: 0010:[<ffffffff83d217d8>] [<ffffffff83d217d8>] batadv_slide_own_bcast_window+0xb8/0x2b0 [ 3149.001223] RSP: 0018:ffff8800b9f4fc58 EFLAGS: 00010246 [ 3149.001223] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000001 [ 3149.001223] RDX: 0000000000000000 RSI: 0000000000000001 RDI: 0000000000000001 [ 3149.001223] RBP: ffff8800b9f4fcb8 R08: 0000000000000002 R09: ffff8800b9f63950 [ 3149.001223] R10: 0000000000000000 R11: 0000000000000000 R12: ffff8800abad2238 [ 3149.001223] R13: 6b6b6b6b6b6b865b R14: ffff88004c13cda0 R15: 0000000000000001 [ 3149.001223] FS: 0000000000000000(0000) GS:ffff8800bbc00000(0000) knlGS:0000000000000000 [ 3149.001223] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 3149.001223] CR2: 00007f006711f1d0 CR3: 000000008258e000 CR4: 00000000000406e0 [ 3149.001223] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 3149.001223] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 3149.001223] Process kworker/u:0 (pid: 6, threadinfo ffff8800b9f4e000, task ffff8800b9f63000) [ 3149.001223] Stack: [ 3149.001223] ffffffff83d21760 ffff8800b9f63000 ffff8800abad2238 0000000000000000 [ 3149.001223] ffff880068f6c438 0000035e00000001 ffff8800b9f4fc98 0000000000000000 [ 3149.001223] ffff8800abad2238 ffff88004c13c2a0 ffff88004c13cda0 0000000000000001 [ 3149.001223] Call Trace: [ 3149.001223] [<ffffffff83d21760>] ? batadv_slide_own_bcast_window+0x40/0x2b0 [ 3149.001223] [<ffffffff83d10ee4>] batadv_iv_ogm_schedule+0x254/0x300 [ 3149.001223] [<ffffffff83d10c90>] ? batadv_iv_ogm_queue_add+0x710/0x710 [ 3149.001223] [<ffffffff811178bf>] ? local_bh_enable_ip+0xef/0x150 [ 3149.001223] [<ffffffff83d25a15>] batadv_send_outstanding_bat_ogm_packet+0xc5/0xf0 [ 3149.001223] [<ffffffff81133ce6>] process_one_work+0x366/0x6a0 [ 3149.001223] [<ffffffff81133ba8>] ? process_one_work+0x228/0x6a0 [ 3149.001223] [<ffffffff811345a8>] worker_thread+0x238/0x370 [ 3149.001223] [<ffffffff81134370>] ? rescuer_thread+0x310/0x310 [ 3149.001223] [<ffffffff8113eb73>] kthread+0xe3/0xf0 [ 3149.001223] [<ffffffff8113ea90>] ? flush_kthread_work+0x1f0/0x1f0 [ 3149.001223] [<ffffffff83dc203c>] ret_from_fork+0x7c/0xb0 [ 3149.001223] [<ffffffff8113ea90>] ? flush_kthread_work+0x1f0/0x1f0 [ 3149.001223] Code: 31 4b fd 85 c0 74 24 48 c7 c2 50 cd bd 84 be 02 03 00 00 48 c7 c7 b4 da bd 84 c6 05 14 ab 16 02 01 e8 ed 16 46 fd 0f 1f 44 00 00 <49> 8b 55 00 48 89 55 b8 e8 0b 55 41 fd 85 c0 74 37 80 3d ee aa [ 3149.001223] RIP [<ffffffff83d217d8>] batadv_slide_own_bcast_window+0xb8/0x2b0 [ 3149.001223] RSP <ffff8800b9f4fc58> [ 3149.105631] ---[ end trace ba69e369627c73e7 ]--- Rip points to: for (i = 0; i < hash->size; i++) { head = &hash->table[i]; rcu_read_lock(); hlist_for_each_entry_rcu(orig_node, head, hash_entry) { <--- here spin_lock_bh(&orig_node->ogm_cnt_lock); word_index = hard_iface->if_num * BATADV_NUM_WORDS; word = &(orig_node->bcast_own[word_index]); Thanks, Sasha

3 3

Re: [B.A.T.M.A.N.] [PATCH] alfred: in recv_alfred_packet() add break at the end of the case block
by Simon Wunderlich 19 Feb '13

19 Feb '13

On Tue, Feb 19, 2013 at 03:36:46PM +0100, Antonio Quartulli wrote: > In recv_alfred_packet() a "break" statement is missing at the end of a case > block and the function is returning -1 instead of 0 even if the packet type was > known. Add a break to let the function behave correctly. > > However this bug is harmless at the moment because the return value of the > function is not checked anywhere. > > Signed-off: Antonio Quartulli <antonio(a)open-mesh.com> > --- > recv.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/recv.c b/recv.c > index 0170695..ffabba5 100644 > --- a/recv.c > +++ b/recv.c > @@ -416,6 +416,7 @@ int recv_alfred_packet(struct globals *globals) > case ALFRED_STATUS_TXEND: > process_alfred_status_txend(globals, &source.sin6_addr, > (struct alfred_status_v0 *)packet); > + break; Applied (git rev 274133d) Thanks, Simon

1 0

[B.A.T.M.A.N.] [PATCH] batman-adv: make batadv_softif_destroy_netlink() static
by Antonio Quartulli 16 Feb '13

16 Feb '13

batadv_softif_destroy_netlink() is used in the file where it is defined only, therefore it must be static. Introduced by 5317331775c3168b8155b03ec89b1c4c508b9043 ("batman-adv: Allow to use rntl_link for device creation/deletion") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- soft-interface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/soft-interface.c b/soft-interface.c index 39caefa..403b8c4 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -653,8 +653,8 @@ void batadv_softif_destroy_sysfs(struct net_device *soft_iface) * @soft_iface: the to-be-removed batman-adv interface * @head: list pointer */ -void batadv_softif_destroy_netlink(struct net_device *soft_iface, - struct list_head *head) +static void batadv_softif_destroy_netlink(struct net_device *soft_iface, + struct list_head *head) { struct batadv_hard_iface *hard_iface; -- 1.8.1.2

2 1

[B.A.T.M.A.N.] [PATCHv2 1/2] batman-adv: free an hard-interface before adding it
by Antonio Quartulli 16 Feb '13

16 Feb '13

When adding a new hard interface (e.h. wlan0) to a soft interface (e.g. bat0) and the former is already enslaved in another virtual interface (e.g. a software bridge) batman-adv has to free the it first and then continue with the adding mechanism. In this way the behaviour becomes consistent with what "ip link set master" does. At the moment batman-adv enslaves the hard interface without checking for the master device, possibly causing strange behaviours which are never wanted by the users. Reported-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- v2: - added compat code for netdev_master_upper_dev_get() compat.h | 9 +++++++++ hard-interface.c | 14 ++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/compat.h b/compat.h index 425b3d9..787cbcc 100644 --- a/compat.h +++ b/compat.h @@ -197,6 +197,8 @@ static inline void eth_hw_addr_random(struct net_device *dev) #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) +#include <linux/netdevice.h> + #define prandom_u32() random32() #define batadv_interface_set_mac_addr(x, y) \ @@ -214,6 +216,13 @@ static int __batadv_interface_set_mac_addr(x, y) #define netdev_master_upper_dev_link netdev_set_master #define netdev_upper_dev_unlink(slave, master) netdev_set_master(slave, NULL) +static inline struct net_device * +netdev_master_upper_dev_get(struct net_device *dev) +{ + ASSERT_RTNL(); + + return dev->master; +} #endif /* < KERNEL_VERSION(3, 9, 0) */ diff --git a/hard-interface.c b/hard-interface.c index c08e39e..fd99e42 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -311,7 +311,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, const char *iface_name) { struct batadv_priv *bat_priv; - struct net_device *soft_iface; + struct net_device *soft_iface, *master; __be16 ethertype = __constant_htons(ETH_P_BATMAN); int ret; @@ -321,11 +321,6 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, if (!atomic_inc_not_zero(&hard_iface->refcount)) goto out; - /* hard-interface is part of a bridge */ - if (hard_iface->net_dev->priv_flags & IFF_BRIDGE_PORT) - pr_err("You are about to enable batman-adv on '%s' which already is part of a bridge. Unless you know exactly what you are doing this is probably wrong and won't work the way you think it would.\n", - hard_iface->net_dev->name); - soft_iface = dev_get_by_name(&init_net, iface_name); if (!soft_iface) { @@ -347,6 +342,13 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, goto err_dev; } + /* check if the interface is enslaved in another virtual one and + * in that case unlink it first + */ + master = netdev_master_upper_dev_get(hard_iface->net_dev); + if (master) + netdev_upper_dev_unlink(hard_iface->net_dev, master); + hard_iface->soft_iface = soft_iface; bat_priv = netdev_priv(hard_iface->soft_iface); -- 1.8.1.2

1 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N February 2013