Commit aa86b03c authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'batadv-net-for-davem-20180919' of git://git.open-mesh.org/linux-merge 



Simon Wunderlich says:

====================
pull request for net: batman-adv 2018-09-19

here are some bugfixes which we would like to see integrated into net.

We forgot to bump the version number in the last round for net-next, so
the belated patch to do that is included - we hope you can adopt it.
This will most likely create a merge conflict later when merging into
net-next with this rounds net-next patchset, but net-next should keep
the 2018.4 version[1].

[1] resolution:

--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -25,11 +25,7 @@
 #define BATADV_DRIVER_DEVICE "batman-adv"

 #ifndef BATADV_SOURCE_VERSION
-<<<<<<<
-#define BATADV_SOURCE_VERSION "2018.3"
-=======
 #define BATADV_SOURCE_VERSION "2018.4"
->>>>>>>
 #endif

 /* B.A.T.M.A.N. parameters */

Please pull or let me know of any problem!

Here are some batman-adv bugfixes:

 - Avoid ELP information leak, by Sven Eckelmann

 - Fix sysfs segfault issues, by Sven Eckelmann (2 patches)

 - Fix locking when adding entries in various lists,
   by Sven Eckelmann (5 patches)

 - Fix refcount if queue_work() fails, by Marek Lindner (2 patches)

 - Fixup forgotten version bump, by Sven Eckelmann
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 69ba423d dabeb13e

net/batman-adv/bat_v_elp.c

+7 −3
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ batadv_v_elp_wifi_neigh_probe(struct batadv_hardif_neigh_node *neigh) 
		 * the packet to be exactly of that size to make the link

		 * throughput estimation effective.

		 */

		skb_put(skb, probe_len - hard_iface->bat_v.elp_skb->len);

		skb_put_zero(skb, probe_len - hard_iface->bat_v.elp_skb->len);



		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

			   "Sending unicast (probe) ELP packet on interface %s to %pM\n",
@@ -268,6 +268,7 @@ static void batadv_v_elp_periodic_work(struct work_struct *work) 
	struct batadv_priv *bat_priv;

	struct sk_buff *skb;

	u32 elp_interval;

	bool ret;



	bat_v = container_of(work, struct batadv_hard_iface_bat_v, elp_wq.work);

	hard_iface = container_of(bat_v, struct batadv_hard_iface, bat_v);
@@ -329,8 +330,11 @@ static void batadv_v_elp_periodic_work(struct work_struct *work) 
		 * may sleep and that is not allowed in an rcu protected

		 * context. Therefore schedule a task for that.

		 */

		queue_work(batadv_event_workqueue,

		ret = queue_work(batadv_event_workqueue,

				 &hardif_neigh->bat_v.metric_work);



		if (!ret)

			batadv_hardif_neigh_put(hardif_neigh);

	}

	rcu_read_unlock();

net/batman-adv/bridge_loop_avoidance.c

+8 −2
Original line number Diff line number Diff line
@@ -1772,6 +1772,7 @@ batadv_bla_loopdetect_check(struct batadv_priv *bat_priv, struct sk_buff *skb, 
{

	struct batadv_bla_backbone_gw *backbone_gw;

	struct ethhdr *ethhdr;

	bool ret;



	ethhdr = eth_hdr(skb);
@@ -1795,8 +1796,13 @@ batadv_bla_loopdetect_check(struct batadv_priv *bat_priv, struct sk_buff *skb, 
	if (unlikely(!backbone_gw))

		return true;



	queue_work(batadv_event_workqueue, &backbone_gw->report_work);

	/* backbone_gw is unreferenced in the report work function function */

	ret = queue_work(batadv_event_workqueue, &backbone_gw->report_work);



	/* backbone_gw is unreferenced in the report work function function

	 * if queue_work() call was successful

	 */

	if (!ret)

		batadv_backbone_gw_put(backbone_gw);



	return true;

}

net/batman-adv/gateway_client.c

+9 −2
Original line number Diff line number Diff line
@@ -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))

net/batman-adv/main.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

net/batman-adv/network-coding.c

+15 −12
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE