commits September 2018

commits@lists.open-mesh.org

1 participants
50 discussions

[alfred] master: alfred: Update CHANGELOG for 2018.3 release (79de686)
by postmaster＠open-mesh.org 14 Sep '18

14 Sep '18

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 79de68617913584575fe5f151b28f3b81812a189 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Sep 14 11:05:57 2018 +0200 alfred: Update CHANGELOG for 2018.3 release Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 79de68617913584575fe5f151b28f3b81812a189 CHANGELOG.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index bb9fcbc..9b89b27 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,11 @@ .. SPDX-License-Identifier: GPL-2.0 +2018.3 (2018-09-14) +=================== + +* (no changes) + + 2018.2 (2018-07-10) ===================

1 0

[batman-adv] ecsv/pu, master: batman-adv: Increase version number to 2018.3 (8dbcc8f)
by postmaster＠open-mesh.org 14 Sep '18

14 Sep '18

Repository : ssh://git@open-mesh.org/batman-adv On branches: ecsv/pu,master >--------------------------------------------------------------- commit 8dbcc8ff98f74c0d1da3ac2d368bb92323401cb2 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Sep 14 10:47:14 2018 +0200 batman-adv: Increase version number to 2018.3 Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 8dbcc8ff98f74c0d1da3ac2d368bb92323401cb2 net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 8da3c93..3ccc75e 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -25,7 +25,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2018.2" +#define BATADV_SOURCE_VERSION "2018.3" #endif /* B.A.T.M.A.N. parameters */

1 0

[linux-merge]linux integration; annotated tag, v4.19-rc3, created. v4.19-rc3
by postmaster＠open-mesh.org 10 Sep '18

10 Sep '18

The annotated tag, v4.19-rc3 has been created at 549008abfd88f89951ac70c8bf78a27a726d7478 (tag) tagging 11da3a7f84f19c26da6f86af878298694ede0804 (commit) replaces v4.19-rc2 tagged by Linus Torvalds on Sun Sep 9 17:26:52 2018 -0700 - Shortlog ------------------------------------------------------------ Linux 4.19-rc3 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAluVukweHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGrv8IAIIX+bODXEt9krxJ 7U9Fx15siqQhxjbcNifgYhKf76GKKw1c6FgxYZwHzOOFxd4WkbXCNyJXL2nAySPs xmNOto6O83Ic7n1W9XxnyUtbduMkyIbq7CLaAhoGCNfp7oIV905vEmYqsAcE7Y+m ech5w0P3T6srGcLOuYeav+8kpob7tTFBYstqxGutEPzf+tpO3Mc9+yEaum2kmZDB CSeU8D64q/u3Q7rl7F/7WB185CqHe4WbUdoKbO+AbIATycl6J2GrkCVUmmlbfU1n N/z3x5k5YXKdv4Tdj0JreC8Dla4Evrw36980chfqjQQuvEo9ATdPJ+cDrhWkz2GN 5sCqeA0= =OjqR -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: Merge branch 'maint' (0ac6431)
by postmaster＠open-mesh.org 07 Sep '18

07 Sep '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 0ac64311bff8ef760eef6499d3fa75e58c916aa1 Merge: b2eab52 acabad7 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Sep 7 08:15:35 2018 +0200 Merge branch 'maint' >--------------------------------------------------------------- 0ac64311bff8ef760eef6499d3fa75e58c916aa1 net/batman-adv/bat_v_elp.c | 8 ++++++-- net/batman-adv/bridge_loop_avoidance.c | 10 ++++++++-- net/batman-adv/gateway_client.c | 11 +++++++++-- net/batman-adv/network-coding.c | 27 +++++++++++++++------------ net/batman-adv/soft-interface.c | 25 ++++++++++++++++++------- net/batman-adv/translation-table.c | 6 ++++-- net/batman-adv/tvlv.c | 8 ++++++-- 7 files changed, 66 insertions(+), 29 deletions(-)

1 0

[batman-adv] master's head updated: Merge branch 'maint' (0ac6431)
by postmaster＠open-mesh.org 07 Sep '18

07 Sep '18

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 24d83a5 batman-adv: fix backbone_gw refcount on queue_work() failure 85100b6 batman-adv: fix hardif_neigh refcount on queue_work() failure 69b3ca7 batman-adv: Prevent duplicated gateway_node entry bab8447 batman-adv: Prevent duplicated nc_node entry 023d3f6 batman-adv: Prevent duplicated softif_vlan entry 7909725 batman-adv: Prevent duplicated global TT entry acabad7 batman-adv: Prevent duplicated tvlv handler 0ac6431 Merge branch 'maint'

1 0

[batman-adv] maint: batman-adv: Prevent duplicated tvlv handler (acabad7)
by postmaster＠open-mesh.org 07 Sep '18

07 Sep '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit acabad79e01740525cf4ff8ce6e9a210b683d420 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Sep 6 14:35:28 2018 +0200 batman-adv: Prevent duplicated tvlv handler The function batadv_tvlv_handler_register is responsible for adding new tvlv_handler to the handler_list. It first checks whether the entry already is in the list or not. If it is, then the creation of a new entry is aborted. But the lock for the list is only held when the list is really modified. This could lead to duplicated entries because another context could create an entry with the same key between the check and the list manipulation. The check and the manipulation of the list must therefore be in the same locked code section. Fixes: 0b6aa0d43767 ("batman-adv: tvlv - basic infrastructure") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Acked-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- acabad79e01740525cf4ff8ce6e9a210b683d420 net/batman-adv/tvlv.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/tvlv.c b/net/batman-adv/tvlv.c index a637458..40e69c9 100644 --- a/net/batman-adv/tvlv.c +++ b/net/batman-adv/tvlv.c @@ -529,15 +529,20 @@ void batadv_tvlv_handler_register(struct batadv_priv *bat_priv, { struct batadv_tvlv_handler *tvlv_handler; + spin_lock_bh(&bat_priv->tvlv.handler_list_lock); + tvlv_handler = batadv_tvlv_handler_get(bat_priv, type, version); if (tvlv_handler) { + spin_unlock_bh(&bat_priv->tvlv.handler_list_lock); batadv_tvlv_handler_put(tvlv_handler); return; } tvlv_handler = kzalloc(sizeof(*tvlv_handler), GFP_ATOMIC); - if (!tvlv_handler) + if (!tvlv_handler) { + spin_unlock_bh(&bat_priv->tvlv.handler_list_lock); return; + } tvlv_handler->ogm_handler = optr; tvlv_handler->unicast_handler = uptr; @@ -547,7 +552,6 @@ void batadv_tvlv_handler_register(struct batadv_priv *bat_priv, kref_init(&tvlv_handler->refcount); INIT_HLIST_NODE(&tvlv_handler->list); - spin_lock_bh(&bat_priv->tvlv.handler_list_lock); kref_get(&tvlv_handler->refcount); hlist_add_head_rcu(&tvlv_handler->list, &bat_priv->tvlv.handler_list); spin_unlock_bh(&bat_priv->tvlv.handler_list_lock);

1 0

[batman-adv] maint: batman-adv: Prevent duplicated softif_vlan entry (023d3f6)
by postmaster＠open-mesh.org 07 Sep '18

07 Sep '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 023d3f64207e8b6a6e6d0718d98e239c5545ef0c Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Sep 6 14:35:26 2018 +0200 batman-adv: Prevent duplicated softif_vlan entry The function batadv_softif_vlan_get is responsible for adding new softif_vlan to the softif_vlan_list. It first checks whether the entry already is in the list or not. If it is, then the creation of a new entry is aborted. But the lock for the list is only held when the list is really modified. This could lead to duplicated entries because another context could create an entry with the same key between the check and the list manipulation. The check and the manipulation of the list must therefore be in the same locked code section. Fixes: 952cebb57518 ("batman-adv: add per VLAN interface attribute framework") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 023d3f64207e8b6a6e6d0718d98e239c5545ef0c net/batman-adv/soft-interface.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 1485263..626ddca 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -574,15 +574,20 @@ int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid) struct batadv_softif_vlan *vlan; int err; + spin_lock_bh(&bat_priv->softif_vlan_list_lock); + vlan = batadv_softif_vlan_get(bat_priv, vid); if (vlan) { batadv_softif_vlan_put(vlan); + spin_unlock_bh(&bat_priv->softif_vlan_list_lock); return -EEXIST; } vlan = kzalloc(sizeof(*vlan), GFP_ATOMIC); - if (!vlan) + if (!vlan) { + spin_unlock_bh(&bat_priv->softif_vlan_list_lock); return -ENOMEM; + } vlan->bat_priv = bat_priv; vlan->vid = vid; @@ -590,17 +595,23 @@ int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid) atomic_set(&vlan->ap_isolation, 0); + kref_get(&vlan->refcount); + hlist_add_head_rcu(&vlan->list, &bat_priv->softif_vlan_list); + spin_unlock_bh(&bat_priv->softif_vlan_list_lock); + + /* batadv_sysfs_add_vlan cannot be in the spinlock section due to the + * sleeping behavior of the sysfs functions and the fs_reclaim lock + */ err = batadv_sysfs_add_vlan(bat_priv->soft_iface, vlan); if (err) { - kfree(vlan); + /* ref for the function */ + batadv_softif_vlan_put(vlan); + + /* ref for the list */ + batadv_softif_vlan_put(vlan); return err; } - spin_lock_bh(&bat_priv->softif_vlan_list_lock); - kref_get(&vlan->refcount); - hlist_add_head_rcu(&vlan->list, &bat_priv->softif_vlan_list); - spin_unlock_bh(&bat_priv->softif_vlan_list_lock); - /* add a new TT local entry. This one will be marked with the NOPURGE * flag */

1 0

[batman-adv] maint: batman-adv: Prevent duplicated gateway_node entry (69b3ca7)
by postmaster＠open-mesh.org 07 Sep '18

07 Sep '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 69b3ca714eba608fe79a51ccd89ce7050ee0b770 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Sep 6 14:35:24 2018 +0200 batman-adv: Prevent duplicated gateway_node entry The function batadv_gw_node_add is responsible for adding new gw_node to the gateway_list. It is expecting that the caller already checked that there is not already an entry with the same key or not. But the lock for the list is only held when the list is really modified. This could lead to duplicated entries because another context could create an entry with the same key between the check and the list manipulation. The check and the manipulation of the list must therefore be in the same locked code section. Fixes: bc3538cabac5 ("batman-adv: adding gateway functionality") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Acked-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 69b3ca714eba608fe79a51ccd89ce7050ee0b770 net/batman-adv/gateway_client.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index 8b198ee..140c61a 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -32,6 +32,7 @@ #include <linux/kernel.h> #include <linux/kref.h> #include <linux/list.h> +#include <linux/lockdep.h> #include <linux/netdevice.h> #include <linux/netlink.h> #include <linux/rculist.h> @@ -348,6 +349,9 @@ out: * @bat_priv: the bat priv with all the soft interface information * @orig_node: originator announcing gateway capabilities * @gateway: announced bandwidth information + * + * Has to be called with the appropriate locks being acquired + * (gw.list_lock). */ static void batadv_gw_node_add(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, @@ -355,6 +359,8 @@ static void batadv_gw_node_add(struct batadv_priv *bat_priv, { struct batadv_gw_node *gw_node; + lockdep_assert_held(&bat_priv->gw.list_lock); + if (gateway->bandwidth_down == 0) return; @@ -369,10 +375,8 @@ static void batadv_gw_node_add(struct batadv_priv *bat_priv, gw_node->bandwidth_down = ntohl(gateway->bandwidth_down); gw_node->bandwidth_up = ntohl(gateway->bandwidth_up); - spin_lock_bh(&bat_priv->gw.list_lock); kref_get(&gw_node->refcount); hlist_add_head_rcu(&gw_node->list, &bat_priv->gw.gateway_list); - spin_unlock_bh(&bat_priv->gw.list_lock); batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Found new gateway %pM -> gw bandwidth: %u.%u/%u.%u MBit\n", @@ -428,11 +432,14 @@ void batadv_gw_node_update(struct batadv_priv *bat_priv, { struct batadv_gw_node *gw_node, *curr_gw = NULL; + spin_lock_bh(&bat_priv->gw.list_lock); gw_node = batadv_gw_node_get(bat_priv, orig_node); if (!gw_node) { batadv_gw_node_add(bat_priv, orig_node, gateway); + spin_unlock_bh(&bat_priv->gw.list_lock); goto out; } + spin_unlock_bh(&bat_priv->gw.list_lock); if (gw_node->bandwidth_down == ntohl(gateway->bandwidth_down) && gw_node->bandwidth_up == ntohl(gateway->bandwidth_up))

1 0

[batman-adv] maint: batman-adv: Prevent duplicated nc_node entry (bab8447)
by postmaster＠open-mesh.org 07 Sep '18

07 Sep '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit bab8447ad1850b25188f9652c0c52f8e58acd656 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Sep 6 14:35:25 2018 +0200 batman-adv: Prevent duplicated nc_node entry The function batadv_nc_get_nc_node is responsible for adding new nc_nodes to the in_coding_list and out_coding_list. It first checks whether the entry already is in the list or not. If it is, then the creation of a new entry is aborted. But the lock for the list is only held when the list is really modified. This could lead to duplicated entries because another context could create an entry with the same key between the check and the list manipulation. The check and the manipulation of the list must therefore be in the same locked code section. Fixes: 3ed7ada3f0bb ("batman-adv: network coding - detect coding nodes and remove these after timeout") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Acked-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- bab8447ad1850b25188f9652c0c52f8e58acd656 net/batman-adv/network-coding.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index c357844..34caf12 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -854,16 +854,27 @@ batadv_nc_get_nc_node(struct batadv_priv *bat_priv, spinlock_t *lock; /* Used to lock list selected by "int in_coding" */ struct list_head *list; + /* Select ingoing or outgoing coding node */ + if (in_coding) { + lock = &orig_neigh_node->in_coding_list_lock; + list = &orig_neigh_node->in_coding_list; + } else { + lock = &orig_neigh_node->out_coding_list_lock; + list = &orig_neigh_node->out_coding_list; + } + + spin_lock_bh(lock); + /* Check if nc_node is already added */ nc_node = batadv_nc_find_nc_node(orig_node, orig_neigh_node, in_coding); /* Node found */ if (nc_node) - return nc_node; + goto unlock; nc_node = kzalloc(sizeof(*nc_node), GFP_ATOMIC); if (!nc_node) - return NULL; + goto unlock; /* Initialize nc_node */ INIT_LIST_HEAD(&nc_node->list); @@ -872,22 +883,14 @@ batadv_nc_get_nc_node(struct batadv_priv *bat_priv, kref_get(&orig_neigh_node->refcount); nc_node->orig_node = orig_neigh_node; - /* Select ingoing or outgoing coding node */ - if (in_coding) { - lock = &orig_neigh_node->in_coding_list_lock; - list = &orig_neigh_node->in_coding_list; - } else { - lock = &orig_neigh_node->out_coding_list_lock; - list = &orig_neigh_node->out_coding_list; - } - batadv_dbg(BATADV_DBG_NC, bat_priv, "Adding nc_node %pM -> %pM\n", nc_node->addr, nc_node->orig_node->orig); /* Add nc_node to orig_node */ - spin_lock_bh(lock); kref_get(&nc_node->refcount); list_add_tail_rcu(&nc_node->list, list); + +unlock: spin_unlock_bh(lock); return nc_node;

1 0

[batman-adv] maint: batman-adv: Prevent duplicated global TT entry (7909725)
by postmaster＠open-mesh.org 07 Sep '18

07 Sep '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 79097255a1a3e1bd1949be309af941181fbc7b36 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Sep 6 14:35:27 2018 +0200 batman-adv: Prevent duplicated global TT entry The function batadv_tt_global_orig_entry_add is responsible for adding new tt_orig_list_entry to the orig_list. It first checks whether the entry already is in the list or not. If it is, then the creation of a new entry is aborted. But the lock for the list is only held when the list is really modified. This could lead to duplicated entries because another context could create an entry with the same key between the check and the list manipulation. The check and the manipulation of the list must therefore be in the same locked code section. Fixes: c5eb5bb30321 ("batman-adv: add reference counting for type batadv_tt_orig_list_entry") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Acked-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 79097255a1a3e1bd1949be309af941181fbc7b36 net/batman-adv/translation-table.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 12a2b7d..d21624c 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -1613,6 +1613,8 @@ batadv_tt_global_orig_entry_add(struct batadv_tt_global_entry *tt_global, { struct batadv_tt_orig_list_entry *orig_entry; + spin_lock_bh(&tt_global->list_lock); + orig_entry = batadv_tt_global_orig_entry_find(tt_global, orig_node); if (orig_entry) { /* refresh the ttvn: the current value could be a bogus one that @@ -1635,11 +1637,9 @@ batadv_tt_global_orig_entry_add(struct batadv_tt_global_entry *tt_global, orig_entry->flags = flags; kref_init(&orig_entry->refcount); - spin_lock_bh(&tt_global->list_lock); kref_get(&orig_entry->refcount); hlist_add_head_rcu(&orig_entry->list, &tt_global->orig_list); - spin_unlock_bh(&tt_global->list_lock); atomic_inc(&tt_global->orig_list_count); sync_flags: @@ -1647,6 +1647,8 @@ sync_flags: out: if (orig_entry) batadv_tt_orig_list_entry_put(orig_entry); + + spin_unlock_bh(&tt_global->list_lock); } /**

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits September 2018