batman-adv: make is_my_mac() check for the current mesh only

Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>



git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/batman-adv@36347 3c298f89-4303-0410-b956-a3cf2f4a3e73

Makefile

@@ -12,7 +12,7 @@ PKG_NAME:=batman-adv
 
 PKG_VERSION:=2013.1.0
 BATCTL_VERSION:=2013.1.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_MD5SUM:=fe1fd32eddde1f91575d7a7ec21d5782
 BATCTL_MD5SUM:=767bf36c77c517e1d321169bf9a7fae5
 

patches/0001-batman-adv-verify-tt-len-does-not-exceed-packet-len.patch

@@ -1,7 +1,7 @@
 From e56c79f4e863436d0fc6c48fed0db09b7a49e565 Mon Sep 17 00:00:00 2001
 From: Marek Lindner <lindner_marek@yahoo.de>
 Date: Mon, 4 Mar 2013 10:39:49 +0800
-Subject: [PATCH] batman-adv: verify tt len does not exceed packet len
+Subject: [PATCH 1/3] batman-adv: verify tt len does not exceed packet len
 
 batadv_iv_ogm_process() accesses the packet using the tt_num_changes
 attribute regardless of the real packet len (assuming the length check

patches/0003-batman-adv-make-is_my_mac-check-for-the-current-mesh.patch

@@ -0,0 +1,250 @@
+From 647d23f3e358d9fa4b1a8f0bb67a3e6bff30d4a1 Mon Sep 17 00:00:00 2001
+From: Antonio Quartulli <ordex@autistici.org>
+Date: Wed, 3 Apr 2013 19:10:26 +0200
+Subject: [PATCH 3/3] batman-adv: make is_my_mac() check for the current mesh
+ only
+
+On a multi-mesh node (a node running more than one batman-adv
+virtual interface) batadv_is_my_mac() has to check MAC
+addresses of hard interfaces belonging to the current mesh
+only.
+
+Signed-off-by: Antonio Quartulli <ordex@autistici.org>
+Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
+---
+ main.c              |    5 ++++-
+ main.h              |    2 +-
+ routing.c           |   38 ++++++++++++++++++++------------------
+ translation-table.c |    2 +-
+ vis.c               |    4 ++--
+ 5 files changed, 28 insertions(+), 23 deletions(-)
+
+diff --git a/main.c b/main.c
+index 0488d70..fa563e4 100644
+--- a/main.c
++++ b/main.c
+@@ -169,7 +169,7 @@ void batadv_mesh_free(struct net_device *soft_iface)
+ 	atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
+ }
+ 
+-int batadv_is_my_mac(const uint8_t *addr)
++int batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr)
+ {
+ 	const struct batadv_hard_iface *hard_iface;
+ 
+@@ -178,6 +178,9 @@ int batadv_is_my_mac(const uint8_t *addr)
+ 		if (hard_iface->if_status != BATADV_IF_ACTIVE)
+ 			continue;
+ 
++		if (hard_iface->soft_iface != bat_priv->soft_iface)
++			continue;
++
+ 		if (batadv_compare_eth(hard_iface->net_dev->dev_addr, addr)) {
+ 			rcu_read_unlock();
+ 			return 1;
+diff --git a/main.h b/main.h
+index 08c5dd1..fcb5d65 100644
+--- a/main.h
++++ b/main.h
+@@ -164,7 +164,7 @@ extern struct workqueue_struct *batadv_event_workqueue;
+ 
+ int batadv_mesh_init(struct net_device *soft_iface);
+ void batadv_mesh_free(struct net_device *soft_iface);
+-int batadv_is_my_mac(const uint8_t *addr);
++int batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr);
+ struct batadv_hard_iface *
+ batadv_seq_print_text_primary_if_get(struct seq_file *seq);
+ int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
+diff --git a/routing.c b/routing.c
+index 5ee21ce..319f290 100644
+--- a/routing.c
++++ b/routing.c
+@@ -402,7 +402,7 @@ int batadv_recv_icmp_packet(struct sk_buff *skb,
+ 		goto out;
+ 
+ 	/* not for me */
+-	if (!batadv_is_my_mac(ethhdr->h_dest))
++	if (!batadv_is_my_mac(bat_priv, ethhdr->h_dest))
+ 		goto out;
+ 
+ 	icmp_packet = (struct batadv_icmp_packet_rr *)skb->data;
+@@ -416,7 +416,7 @@ int batadv_recv_icmp_packet(struct sk_buff *skb,
+ 	}
+ 
+ 	/* packet for me */
+-	if (batadv_is_my_mac(icmp_packet->dst))
++	if (batadv_is_my_mac(bat_priv, icmp_packet->dst))
+ 		return batadv_recv_my_icmp_packet(bat_priv, skb, hdr_size);
+ 
+ 	/* TTL exceeded */
+@@ -548,7 +548,8 @@ batadv_find_ifalter_router(struct batadv_orig_node *primary_orig,
+ 	return router;
+ }
+ 
+-static int batadv_check_unicast_packet(struct sk_buff *skb, int hdr_size)
++static int batadv_check_unicast_packet(struct batadv_priv *bat_priv,
++				       struct sk_buff *skb, int hdr_size)
+ {
+ 	struct ethhdr *ethhdr;
+ 
+@@ -567,7 +568,7 @@ static int batadv_check_unicast_packet(struct sk_buff *skb, int hdr_size)
+ 		return -1;
+ 
+ 	/* not for me */
+-	if (!batadv_is_my_mac(ethhdr->h_dest))
++	if (!batadv_is_my_mac(bat_priv, ethhdr->h_dest))
+ 		return -1;
+ 
+ 	return 0;
+@@ -582,7 +583,7 @@ int batadv_recv_tt_query(struct sk_buff *skb, struct batadv_hard_iface *recv_if)
+ 	char tt_flag;
+ 	size_t packet_size;
+ 
+-	if (batadv_check_unicast_packet(skb, hdr_size) < 0)
++	if (batadv_check_unicast_packet(bat_priv, skb, hdr_size) < 0)
+ 		return NET_RX_DROP;
+ 
+ 	/* I could need to modify it */
+@@ -614,7 +615,7 @@ int batadv_recv_tt_query(struct sk_buff *skb, struct batadv_hard_iface *recv_if)
+ 	case BATADV_TT_RESPONSE:
+ 		batadv_inc_counter(bat_priv, BATADV_CNT_TT_RESPONSE_RX);
+ 
+-		if (batadv_is_my_mac(tt_query->dst)) {
++		if (batadv_is_my_mac(bat_priv, tt_query->dst)) {
+ 			/* packet needs to be linearized to access the TT
+ 			 * changes
+ 			 */
+@@ -657,14 +658,15 @@ int batadv_recv_roam_adv(struct sk_buff *skb, struct batadv_hard_iface *recv_if)
+ 	struct batadv_roam_adv_packet *roam_adv_packet;
+ 	struct batadv_orig_node *orig_node;
+ 
+-	if (batadv_check_unicast_packet(skb, sizeof(*roam_adv_packet)) < 0)
++	if (batadv_check_unicast_packet(bat_priv, skb,
++					sizeof(*roam_adv_packet)) < 0)
+ 		goto out;
+ 
+ 	batadv_inc_counter(bat_priv, BATADV_CNT_TT_ROAM_ADV_RX);
+ 
+ 	roam_adv_packet = (struct batadv_roam_adv_packet *)skb->data;
+ 
+-	if (!batadv_is_my_mac(roam_adv_packet->dst))
++	if (!batadv_is_my_mac(bat_priv, roam_adv_packet->dst))
+ 		return batadv_route_unicast_packet(skb, recv_if);
+ 
+ 	/* check if it is a backbone gateway. we don't accept
+@@ -967,7 +969,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv,
+ 	 * last time) the packet had an updated information or not
+ 	 */
+ 	curr_ttvn = (uint8_t)atomic_read(&bat_priv->tt.vn);
+-	if (!batadv_is_my_mac(unicast_packet->dest)) {
++	if (!batadv_is_my_mac(bat_priv, unicast_packet->dest)) {
+ 		orig_node = batadv_orig_hash_find(bat_priv,
+ 						  unicast_packet->dest);
+ 		/* if it is not possible to find the orig_node representing the
+@@ -1044,14 +1046,14 @@ int batadv_recv_unicast_packet(struct sk_buff *skb,
+ 	if (is4addr)
+ 		hdr_size = sizeof(*unicast_4addr_packet);
+ 
+-	if (batadv_check_unicast_packet(skb, hdr_size) < 0)
++	if (batadv_check_unicast_packet(bat_priv, skb, hdr_size) < 0)
+ 		return NET_RX_DROP;
+ 
+ 	if (!batadv_check_unicast_ttvn(bat_priv, skb))
+ 		return NET_RX_DROP;
+ 
+ 	/* packet for me */
+-	if (batadv_is_my_mac(unicast_packet->dest)) {
++	if (batadv_is_my_mac(bat_priv, unicast_packet->dest)) {
+ 		if (is4addr) {
+ 			batadv_dat_inc_counter(bat_priv,
+ 					       unicast_4addr_packet->subtype);
+@@ -1088,7 +1090,7 @@ int batadv_recv_ucast_frag_packet(struct sk_buff *skb,
+ 	struct sk_buff *new_skb = NULL;
+ 	int ret;
+ 
+-	if (batadv_check_unicast_packet(skb, hdr_size) < 0)
++	if (batadv_check_unicast_packet(bat_priv, skb, hdr_size) < 0)
+ 		return NET_RX_DROP;
+ 
+ 	if (!batadv_check_unicast_ttvn(bat_priv, skb))
+@@ -1097,7 +1099,7 @@ int batadv_recv_ucast_frag_packet(struct sk_buff *skb,
+ 	unicast_packet = (struct batadv_unicast_frag_packet *)skb->data;
+ 
+ 	/* packet for me */
+-	if (batadv_is_my_mac(unicast_packet->dest)) {
++	if (batadv_is_my_mac(bat_priv, unicast_packet->dest)) {
+ 		ret = batadv_frag_reassemble_skb(skb, bat_priv, &new_skb);
+ 
+ 		if (ret == NET_RX_DROP)
+@@ -1151,13 +1153,13 @@ int batadv_recv_bcast_packet(struct sk_buff *skb,
+ 		goto out;
+ 
+ 	/* ignore broadcasts sent by myself */
+-	if (batadv_is_my_mac(ethhdr->h_source))
++	if (batadv_is_my_mac(bat_priv, ethhdr->h_source))
+ 		goto out;
+ 
+ 	bcast_packet = (struct batadv_bcast_packet *)skb->data;
+ 
+ 	/* ignore broadcasts originated by myself */
+-	if (batadv_is_my_mac(bcast_packet->orig))
++	if (batadv_is_my_mac(bat_priv, bcast_packet->orig))
+ 		goto out;
+ 
+ 	if (bcast_packet->header.ttl < 2)
+@@ -1243,14 +1245,14 @@ int batadv_recv_vis_packet(struct sk_buff *skb,
+ 	ethhdr = (struct ethhdr *)skb_mac_header(skb);
+ 
+ 	/* not for me */
+-	if (!batadv_is_my_mac(ethhdr->h_dest))
++	if (!batadv_is_my_mac(bat_priv, ethhdr->h_dest))
+ 		return NET_RX_DROP;
+ 
+ 	/* ignore own packets */
+-	if (batadv_is_my_mac(vis_packet->vis_orig))
++	if (batadv_is_my_mac(bat_priv, vis_packet->vis_orig))
+ 		return NET_RX_DROP;
+ 
+-	if (batadv_is_my_mac(vis_packet->sender_orig))
++	if (batadv_is_my_mac(bat_priv, vis_packet->sender_orig))
+ 		return NET_RX_DROP;
+ 
+ 	switch (vis_packet->vis_type) {
+diff --git a/translation-table.c b/translation-table.c
+index 98a66a0..7abee19 100644
+--- a/translation-table.c
++++ b/translation-table.c
+@@ -1953,7 +1953,7 @@ out:
+ bool batadv_send_tt_response(struct batadv_priv *bat_priv,
+ 			     struct batadv_tt_query_packet *tt_request)
+ {
+-	if (batadv_is_my_mac(tt_request->dst)) {
++	if (batadv_is_my_mac(bat_priv, tt_request->dst)) {
+ 		/* don't answer backbone gws! */
+ 		if (batadv_bla_is_backbone_gw_orig(bat_priv, tt_request->src))
+ 			return true;
+diff --git a/vis.c b/vis.c
+index c053244..6a1e646 100644
+--- a/vis.c
++++ b/vis.c
+@@ -477,7 +477,7 @@ void batadv_receive_client_update_packet(struct batadv_priv *bat_priv,
+ 
+ 	/* Are we the target for this VIS packet? */
+ 	if (vis_server == BATADV_VIS_TYPE_SERVER_SYNC	&&
+-	    batadv_is_my_mac(vis_packet->target_orig))
++	    batadv_is_my_mac(bat_priv, vis_packet->target_orig))
+ 		are_target = 1;
+ 
+ 	spin_lock_bh(&bat_priv->vis.hash_lock);
+@@ -496,7 +496,7 @@ void batadv_receive_client_update_packet(struct batadv_priv *bat_priv,
+ 		batadv_send_list_add(bat_priv, info);
+ 
+ 		/* ... we're not the recipient (and thus need to forward). */
+-	} else if (!batadv_is_my_mac(packet->target_orig)) {
++	} else if (!batadv_is_my_mac(bat_priv, packet->target_orig)) {
+ 		batadv_send_list_add(bat_priv, info);
+ 	}
+ 
+-- 
+1.7.10.4
+