commits May 2014

commits@lists.open-mesh.org

1 participants
88 discussions

[batman-adv] next's head updated: Merge branch 'maint' into next (06566d8)
by postmaster＠open-mesh.org 02 May '14

02 May '14

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: 113f264 batman-adv: fix reference counting imbalance while sending fragment 06566d8 Merge branch 'maint' into next

1 0

[batman-adv] maint: batman-adv: fix reference counting imbalance while sending fragment (113f264)
by postmaster＠open-mesh.org 02 May '14

02 May '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 113f264b60bc4f50011a8f736d74f91ff7da11f1 Author: Antonio Quartulli <antonio(a)open-mesh.com> Date: Wed Apr 23 14:05:16 2014 +0200 batman-adv: fix reference counting imbalance while sending fragment In the new fragmentation code the batadv_frag_send_packet() function obtains a reference to the primary_if, but it does not release it upon return. This reference imbalance prevents the primary_if (and then the related netdevice) to be properly released on shut down. Fix this by releasing the primary_if in batadv_frag_send_packet(). Introduced by db56e4ecf5c2b179a0101138eacc2ec52b6ef45d ("batman-adv: Fragment and send skbs larger than mtu") Cc: Martin Hundebøll <martin(a)hundeboll.net> Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Acked-by: Martin Hundebøll <martin(a)hundeboll.net> >--------------------------------------------------------------- 113f264b60bc4f50011a8f736d74f91ff7da11f1 fragmentation.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/fragmentation.c b/fragmentation.c index 88df9b1..cc1cfd6 100644 --- a/fragmentation.c +++ b/fragmentation.c @@ -418,12 +418,13 @@ bool batadv_frag_send_packet(struct sk_buff *skb, struct batadv_neigh_node *neigh_node) { struct batadv_priv *bat_priv; - struct batadv_hard_iface *primary_if; + struct batadv_hard_iface *primary_if = NULL; struct batadv_frag_packet frag_header; struct sk_buff *skb_fragment; unsigned mtu = neigh_node->if_incoming->net_dev->mtu; unsigned header_size = sizeof(frag_header); unsigned max_fragment_size, max_packet_size; + bool ret = false; /* To avoid merge and refragmentation at next-hops we never send * fragments larger than BATADV_FRAG_MAX_FRAG_SIZE @@ -483,7 +484,11 @@ bool batadv_frag_send_packet(struct sk_buff *skb, skb->len + ETH_HLEN); batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr); - return true; + ret = true; + out_err: - return false; + if (primary_if) + batadv_hardif_free_ref(primary_if); + + return ret; }

1 0

[batman-adv] master's head updated: batman-adv: fix NULL pointer dereferences (be45ab5)
by postmaster＠open-mesh.org 02 May '14

02 May '14

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: be45ab5 batman-adv: fix NULL pointer dereferences

1 0

[batman-adv] next: batman-adv: fix NULL pointer dereferences (be45ab5)
by postmaster＠open-mesh.org 02 May '14

02 May '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit be45ab56df4830a0f2698e948b63807a39abb64d Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Thu Apr 24 03:41:26 2014 +0800 batman-adv: fix NULL pointer dereferences Was introduced with 45dab5f5509023946793fc9d1d0566c12ca8bb52 ("batman-adv: fix more code style") Reported-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Acked-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> >--------------------------------------------------------------- be45ab56df4830a0f2698e948b63807a39abb64d multicast.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/multicast.c b/multicast.c index 8c7ca81..96b66fd 100644 --- a/multicast.c +++ b/multicast.c @@ -415,7 +415,7 @@ batadv_mcast_forw_ipv4_node_get(struct batadv_priv *bat_priv) hlist_for_each_entry_rcu(tmp_orig_node, &bat_priv->mcast.want_all_ipv4_list, mcast_want_all_ipv4_node) { - if (!atomic_inc_not_zero(&orig_node->refcount)) + if (!atomic_inc_not_zero(&tmp_orig_node->refcount)) continue; orig_node = tmp_orig_node; @@ -442,7 +442,7 @@ batadv_mcast_forw_ipv6_node_get(struct batadv_priv *bat_priv) hlist_for_each_entry_rcu(tmp_orig_node, &bat_priv->mcast.want_all_ipv6_list, mcast_want_all_ipv6_node) { - if (!atomic_inc_not_zero(&orig_node->refcount)) + if (!atomic_inc_not_zero(&tmp_orig_node->refcount)) continue; orig_node = tmp_orig_node; @@ -493,7 +493,7 @@ batadv_mcast_forw_unsnoop_node_get(struct batadv_priv *bat_priv) hlist_for_each_entry_rcu(tmp_orig_node, &bat_priv->mcast.want_all_unsnoopables_list, mcast_want_all_unsnoopables_node) { - if (!atomic_inc_not_zero(&orig_node->refcount)) + if (!atomic_inc_not_zero(&tmp_orig_node->refcount)) continue; orig_node = tmp_orig_node;

1 0

[batman-adv] master's head updated: Merge branch 'maint' into next (0563fda)
by postmaster＠open-mesh.org 02 May '14

02 May '14

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: a424cd5 batman-adv: fix neigh_ifinfo imbalance cdd09f6 batman-adv: fix neigh reference imbalance 7212515 batman-adv: always run purge_orig_neighbors 9b9cdbe batman-adv: fix removing neigh_ifinfo 1c2e700 batman-adv: fix local TT check for outgoing arp requests in DAT 31f3914 batman-adv: change the MAC of each VLAN upon ndo_set_mac_address 2ac2c94 batman-adv: fix indirect hard_iface NULL dereference 0563fda Merge branch 'maint' into next

1 0

[batman-adv] next: Merge branch 'maint' into next (0563fda)
by postmaster＠open-mesh.org 02 May '14

02 May '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 0563fda54396e95a23af4e845df298b642715a2b Merge: b08dc3d 2ac2c94 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Fri May 2 13:06:52 2014 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- 0563fda54396e95a23af4e845df298b642715a2b bat_iv_ogm.c | 2 ++ distributed-arp-table.c | 3 +-- originator.c | 62 +++++++++++++++++++++++++++++++++++++++++++---- soft-interface.c | 12 ++++++--- 4 files changed, 69 insertions(+), 10 deletions(-) diff --cc soft-interface.c index 744a59b,d962363..9f070de --- a/soft-interface.c +++ b/soft-interface.c @@@ -112,16 -112,21 +113,21 @@@ static int batadv_interface_set_mac_add if (!is_valid_ether_addr(addr->sa_data)) return -EADDRNOTAVAIL; - memcpy(old_addr, dev->dev_addr, ETH_ALEN); - memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); + ether_addr_copy(old_addr, dev->dev_addr); + ether_addr_copy(dev->dev_addr, addr->sa_data); /* only modify transtable if it has been initialized before */ - if (atomic_read(&bat_priv->mesh_state) == BATADV_MESH_ACTIVE) { - batadv_tt_local_remove(bat_priv, old_addr, BATADV_NO_FLAGS, + if (atomic_read(&bat_priv->mesh_state) != BATADV_MESH_ACTIVE) + return 0; + + rcu_read_lock(); + hlist_for_each_entry_rcu(vlan, &bat_priv->softif_vlan_list, list) { + batadv_tt_local_remove(bat_priv, old_addr, vlan->vid, "mac address changed", false); - batadv_tt_local_add(dev, addr->sa_data, BATADV_NO_FLAGS, + batadv_tt_local_add(dev, addr->sa_data, vlan->vid, BATADV_NULL_IFINDEX, BATADV_NO_MARK); } + rcu_read_unlock(); return 0; }

1 0

[batman-adv] next's head updated: Merge branch 'maint' into next (0563fda)
by postmaster＠open-mesh.org 02 May '14

02 May '14

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: a424cd5 batman-adv: fix neigh_ifinfo imbalance cdd09f6 batman-adv: fix neigh reference imbalance 7212515 batman-adv: always run purge_orig_neighbors 9b9cdbe batman-adv: fix removing neigh_ifinfo 1c2e700 batman-adv: fix local TT check for outgoing arp requests in DAT 31f3914 batman-adv: change the MAC of each VLAN upon ndo_set_mac_address 2ac2c94 batman-adv: fix indirect hard_iface NULL dereference 0563fda Merge branch 'maint' into next

1 0

[batman-adv] maint: batman-adv: fix indirect hard_iface NULL dereference (2ac2c94)
by postmaster＠open-mesh.org 02 May '14

02 May '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 2ac2c94590d49e69ad8400a9df959533195143ed Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Thu Apr 24 03:44:25 2014 +0800 batman-adv: fix indirect hard_iface NULL dereference If hard_iface is NULL and goto out is made batadv_hardif_free_ref() doesn't check for NULL before dereferencing it to get to refcount. Introduced in f13f960797fd1969b3c0470cc97435ddfb6aecb4 ("batman-adv: add debugfs support to view multiif tables"). Reported-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Acked-by: Antonio Quartulli <antonio(a)meshcoding.com> >--------------------------------------------------------------- 2ac2c94590d49e69ad8400a9df959533195143ed originator.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/originator.c b/originator.c index aa2468b..35b42f8 100644 --- a/originator.c +++ b/originator.c @@ -1074,7 +1074,8 @@ int batadv_orig_hardif_seq_print_text(struct seq_file *seq, void *offset) bat_priv->bat_algo_ops->bat_orig_print(bat_priv, seq, hard_iface); out: - batadv_hardif_free_ref(hard_iface); + if (hard_iface) + batadv_hardif_free_ref(hard_iface); return 0; }

1 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits May 2014