Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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



Simon Wunderlich says:

====================
Here are some batman-adv bugfixes:

 - fix skb checksum issues, by Matthias Schiffer (2 patches)

 - fix exception handling when dumping data objects through netlink,
   by Sven Eckelmann (4 patches)

 - fix handling of interface indices, by Sven Eckelmann
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4a0c7191 f22e0893

net/batman-adv/bat_iv_ogm.c

+15 −11
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static void batadv_iv_ogm_orig_free(struct batadv_orig_node *orig_node) 
 * Return: 0 on success, a negative error code otherwise.

 */

static int batadv_iv_ogm_orig_add_if(struct batadv_orig_node *orig_node,

				     int max_if_num)

				     unsigned int max_if_num)

{

	void *data_ptr;

	size_t old_size;
@@ -201,7 +201,8 @@ static int batadv_iv_ogm_orig_add_if(struct batadv_orig_node *orig_node, 
 */

static void

batadv_iv_ogm_drop_bcast_own_entry(struct batadv_orig_node *orig_node,

				   int max_if_num, int del_if_num)

				   unsigned int max_if_num,

				   unsigned int del_if_num)

{

	size_t chunk_size;

	size_t if_offset;
@@ -239,7 +240,8 @@ batadv_iv_ogm_drop_bcast_own_entry(struct batadv_orig_node *orig_node, 
 */

static void

batadv_iv_ogm_drop_bcast_own_sum_entry(struct batadv_orig_node *orig_node,

				       int max_if_num, int del_if_num)

				       unsigned int max_if_num,

				       unsigned int del_if_num)

{

	size_t if_offset;

	void *data_ptr;
@@ -276,7 +278,8 @@ batadv_iv_ogm_drop_bcast_own_sum_entry(struct batadv_orig_node *orig_node, 
 * Return: 0 on success, a negative error code otherwise.

 */

static int batadv_iv_ogm_orig_del_if(struct batadv_orig_node *orig_node,

				     int max_if_num, int del_if_num)

				     unsigned int max_if_num,

				     unsigned int del_if_num)

{

	spin_lock_bh(&orig_node->bat_iv.ogm_cnt_lock);
@@ -311,7 +314,8 @@ static struct batadv_orig_node * 
batadv_iv_ogm_orig_get(struct batadv_priv *bat_priv, const u8 *addr)

{

	struct batadv_orig_node *orig_node;

	int size, hash_added;

	int hash_added;

	size_t size;



	orig_node = batadv_orig_hash_find(bat_priv, addr);

	if (orig_node)
@@ -893,7 +897,7 @@ batadv_iv_ogm_slide_own_bcast_window(struct batadv_hard_iface *hard_iface) 
	u32 i;

	size_t word_index;

	u8 *w;

	int if_num;

	unsigned int if_num;



	for (i = 0; i < hash->size; i++) {

		head = &hash->table[i];
@@ -1023,7 +1027,7 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, 
	struct batadv_neigh_node *tmp_neigh_node = NULL;

	struct batadv_neigh_node *router = NULL;

	struct batadv_orig_node *orig_node_tmp;

	int if_num;

	unsigned int if_num;

	u8 sum_orig, sum_neigh;

	u8 *neigh_addr;

	u8 tq_avg;
@@ -1182,7 +1186,7 @@ static bool batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, 
	u8 total_count;

	u8 orig_eq_count, neigh_rq_count, neigh_rq_inv, tq_own;

	unsigned int neigh_rq_inv_cube, neigh_rq_max_cube;

	int if_num;

	unsigned int if_num;

	unsigned int tq_asym_penalty, inv_asym_penalty;

	unsigned int combined_tq;

	unsigned int tq_iface_penalty;
@@ -1702,9 +1706,9 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset, 


	if (is_my_orig) {

		unsigned long *word;

		int offset;

		size_t offset;

		s32 bit_pos;

		s16 if_num;

		unsigned int if_num;

		u8 *weight;



		orig_neigh_node = batadv_iv_ogm_orig_get(bat_priv,
@@ -2729,7 +2733,7 @@ static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq, 
	struct batadv_neigh_ifinfo *router_ifinfo = NULL;

	struct batadv_neigh_node *router;

	struct batadv_gw_node *curr_gw;

	int ret = -EINVAL;

	int ret = 0;

	void *hdr;



	router = batadv_orig_router_get(gw_node->orig_node, BATADV_IF_DEFAULT);

net/batman-adv/bat_v.c

+1 −1
Original line number Diff line number Diff line
@@ -928,7 +928,7 @@ static int batadv_v_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq, 
	struct batadv_neigh_ifinfo *router_ifinfo = NULL;

	struct batadv_neigh_node *router;

	struct batadv_gw_node *curr_gw;

	int ret = -EINVAL;

	int ret = 0;

	void *hdr;



	router = batadv_orig_router_get(gw_node->orig_node, BATADV_IF_DEFAULT);

net/batman-adv/bridge_loop_avoidance.c

+14 −8
Original line number Diff line number Diff line
@@ -2161,22 +2161,25 @@ batadv_bla_claim_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq, 
{

	struct batadv_bla_claim *claim;

	int idx = 0;

	int ret = 0;



	rcu_read_lock();

	hlist_for_each_entry_rcu(claim, head, hash_entry) {

		if (idx++ < *idx_skip)

			continue;

		if (batadv_bla_claim_dump_entry(msg, portid, seq,

						primary_if, claim)) {



		ret = batadv_bla_claim_dump_entry(msg, portid, seq,

						  primary_if, claim);

		if (ret) {

			*idx_skip = idx - 1;

			goto unlock;

		}

	}



	*idx_skip = idx;

	*idx_skip = 0;

unlock:

	rcu_read_unlock();

	return 0;

	return ret;

}



/**
@@ -2391,22 +2394,25 @@ batadv_bla_backbone_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq, 
{

	struct batadv_bla_backbone_gw *backbone_gw;

	int idx = 0;

	int ret = 0;



	rcu_read_lock();

	hlist_for_each_entry_rcu(backbone_gw, head, hash_entry) {

		if (idx++ < *idx_skip)

			continue;

		if (batadv_bla_backbone_dump_entry(msg, portid, seq,

						   primary_if, backbone_gw)) {



		ret = batadv_bla_backbone_dump_entry(msg, portid, seq,

						     primary_if, backbone_gw);

		if (ret) {

			*idx_skip = idx - 1;

			goto unlock;

		}

	}



	*idx_skip = idx;

	*idx_skip = 0;

unlock:

	rcu_read_unlock();

	return 0;

	return ret;

}



/**

net/batman-adv/fragmentation.c

+2 −1
Original line number Diff line number Diff line
@@ -288,7 +288,8 @@ batadv_frag_merge_packets(struct hlist_head *chain) 
	/* Move the existing MAC header to just before the payload. (Override

	 * the fragment header.)

	 */

	skb_pull_rcsum(skb_out, hdr_size);

	skb_pull(skb_out, hdr_size);

	skb_out->ip_summed = CHECKSUM_NONE;

	memmove(skb_out->data - ETH_HLEN, skb_mac_header(skb_out), ETH_HLEN);

	skb_set_mac_header(skb_out, -ETH_HLEN);

	skb_reset_network_header(skb_out);

net/batman-adv/hard-interface.c

+7 −2
Original line number Diff line number Diff line
@@ -763,6 +763,11 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, 
	hard_iface->soft_iface = soft_iface;

	bat_priv = netdev_priv(hard_iface->soft_iface);



	if (bat_priv->num_ifaces >= UINT_MAX) {

		ret = -ENOSPC;

		goto err_dev;

	}



	ret = netdev_master_upper_dev_link(hard_iface->net_dev,

					   soft_iface, NULL, NULL, NULL);

	if (ret)
@@ -876,7 +881,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface, 
	batadv_hardif_recalc_extra_skbroom(hard_iface->soft_iface);



	/* nobody uses this interface anymore */

	if (!bat_priv->num_ifaces) {

	if (bat_priv->num_ifaces == 0) {

		batadv_gw_check_client_stop(bat_priv);



		if (autodel == BATADV_IF_CLEANUP_AUTO)
@@ -912,7 +917,7 @@ batadv_hardif_add_interface(struct net_device *net_dev) 
	if (ret)

		goto free_if;



	hard_iface->if_num = -1;

	hard_iface->if_num = 0;

	hard_iface->net_dev = net_dev;

	hard_iface->soft_iface = NULL;

	hard_iface->if_status = BATADV_IF_NOT_IN_USE;