commits February 2014

commits@lists.open-mesh.org

1 participants
64 discussions

[batman-adv] next: Merge branch 'maint' into next (637eb9c)
by postmaster＠open-mesh.org 11 Feb '14

11 Feb '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 637eb9c1b9da79b038061bad2ac9724183f3930e Merge: e08e28f df99b07 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Tue Feb 11 20:08:40 2014 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- 637eb9c1b9da79b038061bad2ac9724183f3930e bat_iv_ogm.c | 2 ++ distributed-arp-table.c | 5 +++++ 2 files changed, 7 insertions(+)

1 0

[batman-adv] next's head updated: Merge branch 'maint' into next (637eb9c)
by postmaster＠open-mesh.org 11 Feb '14

11 Feb '14

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: cb4d66e batman-adv: fix potential orig_node reference leak df99b07 batman-adv: fix memory access by setting mac_header in DAT 637eb9c Merge branch 'maint' into next

1 0

[batman-adv] maint: batman-adv: fix memory access by setting mac_header in DAT (df99b07)
by postmaster＠open-mesh.org 11 Feb '14

11 Feb '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit df99b07081eeda5cca292afe2dcc5cb3bf5be154 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Tue Feb 11 11:26:43 2014 +0100 batman-adv: fix memory access by setting mac_header in DAT In the TX path we now have functions that rely on the skb->mac_header field. DAT does not set such field when creating its own ARP packets thus leading to wrong memory access. Fix it by always setting the mac_header after having forged the ARP packet. Introduced by 41b38727749a94c1a65cf0f4be9bfe1cbaf0adeb ("batman-adv: fix potential kernel paging error for unicast transmissions") Reported-by: Russel Senior <russell(a)personaltelco.net> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Tested-by: Russel Senior <russell(a)personaltelco.net> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- df99b07081eeda5cca292afe2dcc5cb3bf5be154 distributed-arp-table.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/distributed-arp-table.c b/distributed-arp-table.c index 6da587a..0b69b61 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -1028,6 +1028,11 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv, if (!skb_new) goto out; + /* the rest of the TX path assumes that the mac_header offset pointing + * to the inner Ethernet header has been set, therefore reset it now. + */ + skb_reset_mac_header(skb_new); + if (vid & BATADV_VLAN_HAS_TAG) skb_new = vlan_insert_tag(skb_new, htons(ETH_P_8021Q), vid & VLAN_VID_MASK);

1 0

[batman-adv] maint: batman-adv: fix potential orig_node reference leak (cb4d66e)
by postmaster＠open-mesh.org 11 Feb '14

11 Feb '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit cb4d66e6803b854663ee758e3eecbda183b0b007 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Sat Feb 8 16:45:06 2014 +0100 batman-adv: fix potential orig_node reference leak Since batadv_orig_node_new() sets the refcount to two, assuming that the calling function will use a reference for putting the orig_node into a hash or similar, both references must be freed if initialization of the orig_node fails. Otherwise that object may be leaked in that error case. Reported-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- cb4d66e6803b854663ee758e3eecbda183b0b007 bat_iv_ogm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 6f4fcdc..c07e59f 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -256,6 +256,8 @@ batadv_iv_ogm_orig_get(struct batadv_priv *bat_priv, const uint8_t *addr) free_bcast_own: kfree(orig_node->bat_iv.bcast_own); free_orig_node: + /* free twice, as batadv_orig_node_new sets refcount to 2 */ + batadv_orig_node_free_ref(orig_node); batadv_orig_node_free_ref(orig_node); return NULL;

1 0

[batman-adv] master: batman-adv: call unregister_netdev() to have it handle the locking for us (548c938)
by postmaster＠open-mesh.org 11 Feb '14

11 Feb '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 548c938bfef2dfad63d999fc9005f1d387e3d15a Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sat Feb 8 23:28:18 2014 +0800 batman-adv: call unregister_netdev() to have it handle the locking for us Reported-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 548c938bfef2dfad63d999fc9005f1d387e3d15a soft-interface.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/soft-interface.c b/soft-interface.c index db3e467..633e9d6 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -652,10 +652,7 @@ static void batadv_softif_destroy_finish(struct work_struct *work) } batadv_sysfs_del_meshif(soft_iface); - - rtnl_lock(); - unregister_netdevice(soft_iface); - rtnl_unlock(); + unregister_netdev(soft_iface); } /**

1 0

[linux-merge]linux integration; annotated tag, v3.14-rc2, created. v3.14-rc2
by postmaster＠open-mesh.org 10 Feb '14

10 Feb '14

The annotated tag, v3.14-rc2 has been created at 97112cce341931fb992ce6afc9d3a9beff9ad81c (tag) tagging b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed (commit) replaces v3.14-rc1 tagged by Linus Torvalds on Sun Feb 9 18:16:01 2014 -0800 - Shortlog ------------------------------------------------------------ Linux 3.14-rc2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJS+DZhAAoJEHm+PkMAQRiGIr0H/3m6AIVm7jfIF4RUv7d7pt1d ClL7DYL27WlIgPFfEOnC4PoeBd+zMzzyG0FviXdfuf1V3ee/9TKmkbfDY1jdq2Z/ Qk7/E5pz/6CxNHFZ2s4zayNpxnd7AqD1unTW5CcsAPwXfQkdqIsvck69cCemWmn5 pKCTm3fQ+OSKwUorntx1DxfHNLPVDu+H7pP0bGbJUazAtBKXyQq9nyxz9N0gGfSm XgFXYEA+NobViTxNrgNFla8GUR4mM5+3SyPZ/60bFwNyuync4WwGD9gTHg38yOh3 9VIeEVUUWyfCpJ72UQ11wxR3HqAQEJkrE786QF2klTpozZlwyFwB0HV7PPEgHTA= =TDJv -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: Merge branch 'next' (11beafc)
by postmaster＠open-mesh.org 08 Feb '14

08 Feb '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 11beafc4cbb0a28d06944503578d9c3d98073dcd Merge: b8ffcbc e08e28f Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sat Feb 8 21:23:25 2014 +0800 Merge branch 'next' >--------------------------------------------------------------- 11beafc4cbb0a28d06944503578d9c3d98073dcd bat_iv_ogm.c | 22 ++++++++++++++++------ originator.c | 36 ++++++++++++++++++++++++++++++++++++ originator.h | 4 ++++ 3 files changed, 56 insertions(+), 6 deletions(-)

1 0

[batman-adv] master's head updated: Merge branch 'next' (11beafc)
by postmaster＠open-mesh.org 08 Feb '14

08 Feb '14

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: e08e28f batman-adv: avoid potential race condition when adding a new neighbour 11beafc Merge branch 'next'

1 0

[batman-adv] next: batman-adv: avoid potential race condition when adding a new neighbour (e08e28f)
by postmaster＠open-mesh.org 08 Feb '14

08 Feb '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit e08e28fab0d46b0a722a70bbc59cf7f76a98aba8 Author: Antonio Quartulli <antonio(a)open-mesh.com> Date: Wed Jan 29 11:25:12 2014 +0100 batman-adv: avoid potential race condition when adding a new neighbour When adding a new neighbour it is important to atomically perform the following: - check if the neighbour already exists - append the neighbour to the proper list If the two operations are not performed in an atomic context it is possible that two concurrent insertions add the same neighbour twice. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- e08e28fab0d46b0a722a70bbc59cf7f76a98aba8 bat_iv_ogm.c | 22 ++++++++++++++++------ originator.c | 36 ++++++++++++++++++++++++++++++++++++ originator.h | 4 ++++ 3 files changed, 56 insertions(+), 6 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 512159b..094ae7c 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -266,7 +266,7 @@ batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface, struct batadv_orig_node *orig_neigh) { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); - struct batadv_neigh_node *neigh_node; + struct batadv_neigh_node *neigh_node, *tmp_neigh_node; neigh_node = batadv_neigh_node_new(hard_iface, neigh_addr, orig_node); if (!neigh_node) @@ -281,14 +281,24 @@ batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface, neigh_node->orig_node = orig_neigh; neigh_node->if_incoming = hard_iface; - batadv_dbg(BATADV_DBG_BATMAN, bat_priv, - "Creating new neighbor %pM for orig_node %pM on interface %s\n", - neigh_addr, orig_node->orig, hard_iface->net_dev->name); - spin_lock_bh(&orig_node->neigh_list_lock); - hlist_add_head_rcu(&neigh_node->list, &orig_node->neigh_list); + tmp_neigh_node = batadv_neigh_node_get(orig_node, hard_iface, + neigh_addr); + if (!tmp_neigh_node) { + hlist_add_head_rcu(&neigh_node->list, &orig_node->neigh_list); + } else { + kfree(neigh_node); + batadv_hardif_free_ref(hard_iface); + neigh_node = tmp_neigh_node; + } spin_unlock_bh(&orig_node->neigh_list_lock); + if (!tmp_neigh_node) + batadv_dbg(BATADV_DBG_BATMAN, bat_priv, + "Creating new neighbor %pM for orig_node %pM on interface %s\n", + neigh_addr, orig_node->orig, + hard_iface->net_dev->name); + out: return neigh_node; } diff --git a/originator.c b/originator.c index 6df12a2..8539416 100644 --- a/originator.c +++ b/originator.c @@ -458,6 +458,42 @@ out: } /** + * batadv_neigh_node_get - retrieve a neighbour from the list + * @orig_node: originator which the neighbour belongs to + * @hard_iface: the interface where this neighbour is connected to + * @addr: the address of the neighbour + * + * Looks for and possibly returns a neighbour belonging to this originator list + * which is connected through the provided hard interface. + * Returns NULL if the neighbour is not found. + */ +struct batadv_neigh_node * +batadv_neigh_node_get(const struct batadv_orig_node *orig_node, + const struct batadv_hard_iface *hard_iface, + const uint8_t *addr) +{ + struct batadv_neigh_node *tmp_neigh_node, *res = NULL; + + rcu_read_lock(); + hlist_for_each_entry_rcu(tmp_neigh_node, &orig_node->neigh_list, list) { + if (!batadv_compare_eth(tmp_neigh_node->addr, addr)) + continue; + + if (tmp_neigh_node->if_incoming != hard_iface) + continue; + + if (!atomic_inc_not_zero(&tmp_neigh_node->refcount)) + continue; + + res = tmp_neigh_node; + break; + } + rcu_read_unlock(); + + return res; +} + +/** * batadv_orig_ifinfo_free_rcu - free the orig_ifinfo object * @rcu: rcu pointer of the orig_ifinfo object */ diff --git a/originator.h b/originator.h index 37be290..db3a9ed 100644 --- a/originator.h +++ b/originator.h @@ -29,6 +29,10 @@ void batadv_orig_node_free_ref_now(struct batadv_orig_node *orig_node); struct batadv_orig_node *batadv_orig_node_new(struct batadv_priv *bat_priv, const uint8_t *addr); struct batadv_neigh_node * +batadv_neigh_node_get(const struct batadv_orig_node *orig_node, + const struct batadv_hard_iface *hard_iface, + const uint8_t *addr); +struct batadv_neigh_node * batadv_neigh_node_new(struct batadv_hard_iface *hard_iface, const uint8_t *neigh_addr, struct batadv_orig_node *orig_node);

1 0

[batman-adv] master's head updated: Merge branch 'next' (b8ffcbc)
by postmaster＠open-mesh.org 08 Feb '14

08 Feb '14

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: b921e8f batman-adv: backport eth_hdr() compat fix to avoid kernel oops b04eca1 Merge branch 'maint' into next b8ffcbc Merge branch 'next'

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits February 2014