B.A.T.M.A.N September 2012

b.a.t.m.a.n@lists.open-mesh.org

14 participants
33 discussions

[B.A.T.M.A.N.] [PATCH] batman-adv: don't rely on positions in struct for hashing

by Simon Wunderlich

The hash functions in the bridge loop avoidance code expects the VLAN vid to be right after the mac address, but this is not guaranteed. Fix this by explicitly hashing over the right fields of the struct. Reported-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> --- bridge_loop_avoidance.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 0921509..7e62c79 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -37,18 +37,26 @@ static void batadv_bla_periodic_work(struct work_struct *work); static void batadv_bla_send_announce(struct batadv_priv *bat_priv, struct batadv_backbone_gw *backbone_gw); +static inline void hash_bytes(uint32_t *hash, void *data, uint32_t size) +{ + const unsigned char *key = data; + int i; + + for (i = 0; i < size; i++) { + *hash += key[i]; + *hash += (*hash << 10); + *hash ^= (*hash >> 6); + } +} + /* return the index of the claim */ static inline uint32_t batadv_choose_claim(const void *data, uint32_t size) { - const unsigned char *key = data; + struct batadv_claim *claim = (struct batadv_claim *)data; uint32_t hash = 0; - size_t i; - for (i = 0; i < ETH_ALEN + sizeof(short); i++) { - hash += key[i]; - hash += (hash << 10); - hash ^= (hash >> 6); - } + hash_bytes(&hash, &claim->addr, sizeof(claim->addr)); + hash_bytes(&hash, &claim->vid, sizeof(claim->vid)); hash += (hash << 3); hash ^= (hash >> 11); @@ -61,15 +69,11 @@ static inline uint32_t batadv_choose_claim(const void *data, uint32_t size) static inline uint32_t batadv_choose_backbone_gw(const void *data, uint32_t size) { - const unsigned char *key = data; + struct batadv_claim *claim = (struct batadv_claim *)data; uint32_t hash = 0; - size_t i; - for (i = 0; i < ETH_ALEN + sizeof(short); i++) { - hash += key[i]; - hash += (hash << 10); - hash ^= (hash >> 6); - } + hash_bytes(&hash, &claim->addr, sizeof(claim->addr)); + hash_bytes(&hash, &claim->vid, sizeof(claim->vid)); hash += (hash << 3); hash ^= (hash >> 11); -- 1.7.10

10 years, 6 months

[B.A.T.M.A.N.] [PATCH] batman-adv: substitute tt_poss_change with a per-tt_entry flag

by Antonio Quartulli

tt_poss_change is a node-wide flag which tells whether the node is in a roaming state (a client recently moved to/away from it) in order to let it apply special re-routing rules. However this flag does not give a clear idea of the current state because it is not possible to understand *which client* is actually involved in the roaming. For this reason a better approach has been chosen: instead of using a node-wide variable, the roaming state is now given by a per-tt_entry ROAM flag which, in case of packet coming through the node, tells the it whether the real destination is in roaming state or not. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- originator.c | 1 - routing.c | 62 +++++++++++++++++++++++++++++------------------------ soft-interface.c | 1 - translation-table.c | 46 ++++++++++++++++++++++++++++----------- translation-table.h | 2 ++ types.h | 8 ------- 6 files changed, 69 insertions(+), 51 deletions(-) diff --git a/originator.c b/originator.c index d9c14b8..bf27edc 100644 --- a/originator.c +++ b/originator.c @@ -220,7 +220,6 @@ struct batadv_orig_node *batadv_get_orig_node(struct batadv_priv *bat_priv, atomic_set(&orig_node->refcount, 2); orig_node->tt_initialised = false; - orig_node->tt_poss_change = false; orig_node->bat_priv = bat_priv; memcpy(orig_node->orig, addr, ETH_ALEN); orig_node->router = NULL; diff --git a/routing.c b/routing.c index 44109cc..b994ee4 100644 --- a/routing.c +++ b/routing.c @@ -710,12 +710,6 @@ int batadv_recv_roam_adv(struct sk_buff *skb, struct batadv_hard_iface *recv_if) BATADV_TT_CLIENT_ROAM, atomic_read(&orig_node->last_ttvn) + 1); - /* Roaming phase starts: I have new information but the ttvn has not - * been incremented yet. This flag will make me check all the incoming - * packets for the correct destination. - */ - bat_priv->tt.poss_change = true; - batadv_orig_node_free_ref(orig_node); out: /* returning NET_RX_DROP will make the caller function kfree the skb */ @@ -900,13 +894,13 @@ out: static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, struct sk_buff *skb) { - uint8_t curr_ttvn; + uint8_t curr_ttvn, new_ttvn; struct batadv_orig_node *orig_node; struct ethhdr *ethhdr; struct batadv_hard_iface *primary_if; struct batadv_unicast_packet *unicast_packet; - bool tt_poss_change; int is_old_ttvn; + atomic_t *ttvn_ptr; /* check if there is enough data before accessing it */ if (pskb_may_pull(skb, sizeof(*unicast_packet) + ETH_HLEN) < 0) @@ -917,9 +911,37 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, return 0; unicast_packet = (struct batadv_unicast_packet *)skb->data; + ethhdr = (struct ethhdr *)(skb->data + sizeof(*unicast_packet)); if (batadv_is_my_mac(unicast_packet->dest)) { - tt_poss_change = bat_priv->tt.poss_change; + if (batadv_tt_local_client_is_roaming(bat_priv, + ethhdr->h_dest)) { + /* If the client is roaming, it means that the node has + * got a ROAM_ADV packet and therefore it is possible to + * look into the translation table for the real + * destination + */ + orig_node = batadv_transtable_search(bat_priv, NULL, + ethhdr->h_dest); + if (orig_node) { + memcpy(unicast_packet->dest, orig_node->orig, + ETH_ALEN); + ttvn_ptr = &orig_node->last_ttvn; + curr_ttvn = (uint8_t)atomic_read(ttvn_ptr); + unicast_packet->ttvn = curr_ttvn; + batadv_orig_node_free_ref(orig_node); + net_ratelimited_function(batadv_dbg, + BATADV_DBG_TT, + bat_priv, + "Local client (%pM) is roaming! Rerouting unicast packet to %pM\n", + ethhdr->h_dest, + unicast_packet->dest); + } + return 1; + } + /* It is now possible to move to the second step and check the + * TTVN + */ curr_ttvn = (uint8_t)atomic_read(&bat_priv->tt.vn); } else { orig_node = batadv_orig_hash_find(bat_priv, @@ -929,30 +951,14 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, return 0; curr_ttvn = (uint8_t)atomic_read(&orig_node->last_ttvn); - tt_poss_change = orig_node->tt_poss_change; batadv_orig_node_free_ref(orig_node); } - /* Check whether I have to reroute the packet */ + /* Check whether this packet has to be rerouted because of old ttvn */ is_old_ttvn = batadv_seq_before(unicast_packet->ttvn, curr_ttvn); - if (is_old_ttvn || tt_poss_change) { - /* check if there is enough data before accessing it */ - if (pskb_may_pull(skb, sizeof(struct batadv_unicast_packet) + - ETH_HLEN) < 0) - return 0; - - ethhdr = (struct ethhdr *)(skb->data + sizeof(*unicast_packet)); - - /* we don't have an updated route for this client, so we should - * not try to reroute the packet!! - */ - if (batadv_tt_global_client_is_roaming(bat_priv, - ethhdr->h_dest)) - return 1; - + if (is_old_ttvn) { orig_node = batadv_transtable_search(bat_priv, NULL, ethhdr->h_dest); - if (!orig_node) { if (!batadv_is_my_client(bat_priv, ethhdr->h_dest)) return 0; @@ -965,7 +971,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, } else { memcpy(unicast_packet->dest, orig_node->orig, ETH_ALEN); - curr_ttvn = (uint8_t)atomic_read(&orig_node->last_ttvn); + new_ttvn = (uint8_t)atomic_read(&orig_node->last_ttvn); batadv_orig_node_free_ref(orig_node); } diff --git a/soft-interface.c b/soft-interface.c index a584f62..ddee4a4 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -462,7 +462,6 @@ struct net_device *batadv_softif_create(const char *name) #endif bat_priv->tt.last_changeset = NULL; bat_priv->tt.last_changeset_len = 0; - bat_priv->tt.poss_change = false; bat_priv->primary_if = NULL; bat_priv->num_ifaces = 0; diff --git a/translation-table.c b/translation-table.c index a570d95..21830f5 100644 --- a/translation-table.c +++ b/translation-table.c @@ -306,8 +306,6 @@ void batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, head = &tt_global_entry->orig_list; rcu_read_lock(); hlist_for_each_entry_rcu(orig_entry, node, head, list) { - orig_entry->orig_node->tt_poss_change = true; - batadv_send_roam_adv(bat_priv, tt_global_entry->common.addr, orig_entry->orig_node); @@ -512,8 +510,11 @@ uint16_t batadv_tt_local_remove(struct batadv_priv *bat_priv, curr_flags = tt_local_entry->common.flags; flags = BATADV_TT_CLIENT_DEL; - if (roaming) + if (roaming) { flags |= BATADV_TT_CLIENT_ROAM; + /* mark the local client as ROAMed */ + tt_local_entry->common.flags |= BATADV_TT_CLIENT_ROAM; + } batadv_tt_local_set_pending(bat_priv, tt_local_entry, flags, message); @@ -1996,10 +1997,6 @@ void batadv_handle_tt_response(struct batadv_priv *bat_priv, /* Recalculate the CRC for this orig_node and store it */ orig_node->tt_crc = batadv_tt_global_crc(bat_priv, orig_node); - /* Roaming phase is over: tables are in sync again. I can - * unset the flag - */ - orig_node->tt_poss_change = false; out: if (orig_node) batadv_orig_node_free_ref(orig_node); @@ -2290,7 +2287,6 @@ static int batadv_tt_commit_changes(struct batadv_priv *bat_priv, batadv_dbg(BATADV_DBG_TT, bat_priv, "Local changes committed, updating to ttvn %u\n", (uint8_t)atomic_read(&bat_priv->tt.vn)); - bat_priv->tt.poss_change = false; /* reset the sending counter */ atomic_set(&bat_priv->tt.ogm_append_cnt, BATADV_TT_OGM_APPEND_MAX); @@ -2402,11 +2398,6 @@ void batadv_tt_update_orig(struct batadv_priv *bat_priv, */ if (orig_node->tt_crc != tt_crc) goto request_table; - - /* Roaming phase is over: tables are in sync again. I can - * unset the flag - */ - orig_node->tt_poss_change = false; } else { /* if we missed more than one change or our tables are not * in sync anymore -> request fresh tt data @@ -2445,6 +2436,35 @@ out: return ret; } +/** + * batadv_tt_local_client_is_roaming - tells whether the client is roaming or not + * @bat_priv: the bat priv with all the soft interface information + * @addr: the MAC address of the local client to query + * + * Returns true if the local client is known to be roaming (it is not served by + * this node anymore) or not. The client in this state is still present in the + * table to keep it consistent with the node TTVN value + */ +bool batadv_tt_local_client_is_roaming(struct batadv_priv *bat_priv, + uint8_t *addr) +{ + struct batadv_tt_local_entry *tt_local_entry; + bool ret = false; + + tt_local_entry = batadv_tt_local_hash_find(bat_priv, addr); + if (!tt_local_entry) + goto out; + + /*if (tt_local_entry->common.flags & BATADV_TT_CLIENT_PENDING) + goto out;*/ + + ret = !!(tt_local_entry->common.flags & BATADV_TT_CLIENT_ROAM); + batadv_tt_local_entry_free_ref(tt_local_entry); +out: + return ret; + +} + bool batadv_tt_add_temporary_global_entry(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, const unsigned char *addr) diff --git a/translation-table.h b/translation-table.h index 9fa4fe4..46d4451 100644 --- a/translation-table.h +++ b/translation-table.h @@ -59,6 +59,8 @@ int batadv_tt_append_diff(struct batadv_priv *bat_priv, int packet_min_len); bool batadv_tt_global_client_is_roaming(struct batadv_priv *bat_priv, uint8_t *addr); +bool batadv_tt_local_client_is_roaming(struct batadv_priv *bat_priv, + uint8_t *addr); bool batadv_tt_add_temporary_global_entry(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, const unsigned char *addr); diff --git a/types.h b/types.h index dc126e7..7e69340 100644 --- a/types.h +++ b/types.h @@ -87,13 +87,6 @@ struct batadv_orig_node { spinlock_t tt_buff_lock; /* protects tt_buff */ atomic_t tt_size; bool tt_initialised; - /* The tt_poss_change flag is used to detect an ongoing roaming phase. - * If true, then I sent a Roaming_adv to this orig_node and I have to - * inspect every packet directed to it to check whether it is still - * the true destination or not. This flag will be reset to false as - * soon as I receive a new TTVN from this orig_node - */ - bool tt_poss_change; uint32_t last_real_seqno; uint8_t last_ttl; DECLARE_BITMAP(bcast_bits, BATADV_TQ_LOCAL_WINDOW_SIZE); @@ -191,7 +184,6 @@ struct batadv_priv_tt { atomic_t vn; atomic_t ogm_append_cnt; atomic_t local_changes; - bool poss_change; struct list_head changes_list; struct batadv_hashtable *local_hash; struct batadv_hashtable *global_hash; -- 1.7.12

10 years, 6 months

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Write lockdep xmit class in late initialization phase

by Sven Eckelmann

e27bb6fa916451e9eaced16e7c21d5b71a3b7f30 ("batman-adv: Set special lockdep classes to avoid lockdep warning") introduced a lockdep class for the tx queue, but did not set it in the correct initialization phase. The batman-adv specific lock class could be replaced by a later netdevice registration phase. Reported-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- soft-interface.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/soft-interface.c b/soft-interface.c index a584f62..72d8767 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -352,16 +352,6 @@ out: return; } -static const struct net_device_ops batadv_netdev_ops = { - .ndo_open = batadv_interface_open, - .ndo_stop = batadv_interface_release, - .ndo_get_stats = batadv_interface_stats, - .ndo_set_mac_address = batadv_interface_set_mac_addr, - .ndo_change_mtu = batadv_interface_change_mtu, - .ndo_start_xmit = batadv_interface_tx, - .ndo_validate_addr = eth_validate_addr -}; - /* batman-adv network devices have devices nesting below it and are a special * "super class" of normal network devices; split their locks off into a * separate class since they always nest. @@ -382,6 +372,30 @@ static void batadv_set_lockdep_class(struct net_device *dev) netdev_for_each_tx_queue(dev, batadv_set_lockdep_class_one, NULL); } +/** + * batadv_softif_init - Late stage initialization of soft interface + * @dev: registered network device to modify + * + * Returns error code on failures + */ +static int batadv_softif_init(struct net_device *dev) +{ + batadv_set_lockdep_class(dev); + + return 0; +} + +static const struct net_device_ops batadv_netdev_ops = { + .ndo_init = batadv_softif_init, + .ndo_open = batadv_interface_open, + .ndo_stop = batadv_interface_release, + .ndo_get_stats = batadv_interface_stats, + .ndo_set_mac_address = batadv_interface_set_mac_addr, + .ndo_change_mtu = batadv_interface_change_mtu, + .ndo_start_xmit = batadv_interface_tx, + .ndo_validate_addr = eth_validate_addr +}; + static void batadv_interface_setup(struct net_device *dev) { struct batadv_priv *priv = netdev_priv(dev); @@ -391,7 +405,6 @@ static void batadv_interface_setup(struct net_device *dev) dev->netdev_ops = &batadv_netdev_ops; dev->destructor = free_netdev; dev->tx_queue_len = 0; - batadv_set_lockdep_class(dev); /* can't call min_mtu, because the needed variables * have not been initialized yet -- 1.7.10.4

10 years, 6 months

[B.A.T.M.A.N.] How to force a specific network topology

by Esteban Municio

Hi list Is there any way to block some links between nodes in order to force a specific network topology in batman-adv? Por example, if y have 3 nodes A, B, C and I want to create a string topology A <-> B <-> C, where A can not connect directly with C, how could I get it without move far away the nodes? Thanks you! Regards -- Esteban

10 years, 6 months

[B.A.T.M.A.N.] best way to piggy back data on OGM in batmand

by Dominic Follett-Smith

Could anyone point me in the best direction for how to include some extra information in the OGM packet without increasing its size? Say for instance I want to send a specific value in the range [0:100] along with the OGM. Regards Dominic UCT -- If you are going to achieve excellence in big things, you develop the habit in little matters. Excellence is not an exception, it is a prevailing attitude. Colin Powell

10 years, 6 months

[B.A.T.M.A.N.] [PATCH] batman-adv: add kernel-doc for enum batadv_dbg_level

by Antonio Quartulli

Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- main.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/main.h b/main.h index c243294..e828755 100644 --- a/main.h +++ b/main.h @@ -167,12 +167,19 @@ int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops); int batadv_algo_select(struct batadv_priv *bat_priv, char *name); int batadv_algo_seq_print_text(struct seq_file *seq, void *offset); -/* all messages related to routing / flooding / broadcasting / etc */ +/** + * enum batadv_dbg_level - available log levels + * @BATADV_DBG_BATMAN: OGM and TQ computations related messages + * @BATADV_DBG_ROUTES: route added / changed / deleted + * @BATADV_DBG_TT: translation table messages + * @BATADV_DBG_BLA: bridge loop avoidance messages + * @BATADV_DBG_ALL: the union of all the above log levels + */ enum batadv_dbg_level { BATADV_DBG_BATMAN = BIT(0), - BATADV_DBG_ROUTES = BIT(1), /* route added / changed / deleted */ - BATADV_DBG_TT = BIT(2), /* translation table operations */ - BATADV_DBG_BLA = BIT(3), /* bridge loop avoidance */ + BATADV_DBG_ROUTES = BIT(1), + BATADV_DBG_TT = BIT(2), + BATADV_DBG_BLA = BIT(3), BATADV_DBG_ALL = 15, }; -- 1.7.12

10 years, 6 months

[B.A.T.M.A.N.] [PATCHv5] batman-adv: pass the WIFI flag from the local to global entry

by Antonio Quartulli

in case of client roaming a new global entry is added while a corresponding local one is still present. In this case the node can safely pass the WIFI flag from the local to the global entry. This change is required to let the AP-isolation correctly working in case of roaming: if a generic WIFI client C roams from node A to B, A adds a global entry for C without adding any WIFI flag. The latter will be set only later, once A has received C's advertisement from B. In this time period the AP-Isolation (if enabled) would not correctly work since C is not marked as WIFI, so allowing it to communicate with other WIFI clients. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- v5: - reduced code complexity - batadv_tt_local_remove() now returns the flags set on the removed entry. translation-table.c | 31 +++++++++++++++++++++++++------ translation-table.h | 6 +++--- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/translation-table.c b/translation-table.c index 42a74e3..255b38e 100644 --- a/translation-table.c +++ b/translation-table.c @@ -489,24 +489,39 @@ batadv_tt_local_set_pending(struct batadv_priv *bat_priv, tt_local_entry->common.addr, message); } -void batadv_tt_local_remove(struct batadv_priv *bat_priv, const uint8_t *addr, - const char *message, bool roaming) +/** + * batadv_tt_local_remove - logically remove an entry from the local table + * @bat_priv: the bat priv with all the soft interface information + * @addr: the MAC address of the client to remove + * @message: message to append to the log on deletion + * @roaming: true if the deletion is due to a roaming event + * + * Returns the flags assigned to the local entry before being deleted + */ +uint16_t batadv_tt_local_remove(struct batadv_priv *bat_priv, + const uint8_t *addr, const char *message, + bool roaming) { struct batadv_tt_local_entry *tt_local_entry = NULL; - uint16_t flags; + uint16_t flags, curr_flags = BATADV_NO_FLAGS; tt_local_entry = batadv_tt_local_hash_find(bat_priv, addr); if (!tt_local_entry) goto out; + curr_flags = tt_local_entry->common.flags; + flags = BATADV_TT_CLIENT_DEL; if (roaming) flags |= BATADV_TT_CLIENT_ROAM; batadv_tt_local_set_pending(bat_priv, tt_local_entry, flags, message); + out: if (tt_local_entry) batadv_tt_local_entry_free_ref(tt_local_entry); + + return curr_flags; } static void batadv_tt_local_purge_list(struct batadv_priv *bat_priv, @@ -713,6 +728,7 @@ int batadv_tt_global_add(struct batadv_priv *bat_priv, int ret = 0; int hash_added; struct batadv_tt_common_entry *common; + uint16_t local_flags; tt_global_entry = batadv_tt_global_hash_find(bat_priv, tt_addr); @@ -779,10 +795,13 @@ int batadv_tt_global_add(struct batadv_priv *bat_priv, ret = 1; out_remove: + /* remove address from local hash if present */ - batadv_tt_local_remove(bat_priv, tt_global_entry->common.addr, - "global tt received", - flags & BATADV_TT_CLIENT_ROAM); + local_flags = batadv_tt_local_remove(bat_priv, tt_addr, + "global tt received", + flags & BATADV_TT_CLIENT_ROAM); + tt_global_entry->common.flags |= local_flags & BATADV_TT_CLIENT_WIFI; + out: if (tt_global_entry) batadv_tt_global_entry_free_ref(tt_global_entry); diff --git a/translation-table.h b/translation-table.h index 811fffd..9fa4fe4 100644 --- a/translation-table.h +++ b/translation-table.h @@ -24,9 +24,9 @@ int batadv_tt_len(int changes_num); int batadv_tt_init(struct batadv_priv *bat_priv); void batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, int ifindex); -void batadv_tt_local_remove(struct batadv_priv *bat_priv, - const uint8_t *addr, const char *message, - bool roaming); +uint16_t batadv_tt_local_remove(struct batadv_priv *bat_priv, + const uint8_t *addr, const char *message, + bool roaming); int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset); void batadv_tt_global_add_orig(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, -- 1.7.12

10 years, 6 months

[B.A.T.M.A.N.] [PATCH] batman-adv: properly convert flag into a boolean value

by Antonio Quartulli

In order to properly convert a bitwise AND to a boolean value, the whole expression must be prepended by "!!". Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- translation-table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translation-table.c b/translation-table.c index 1d53a06..a570d95 100644 --- a/translation-table.c +++ b/translation-table.c @@ -2439,7 +2439,7 @@ bool batadv_tt_global_client_is_roaming(struct batadv_priv *bat_priv, if (!tt_global_entry) goto out; - ret = tt_global_entry->common.flags & BATADV_TT_CLIENT_ROAM; + ret = !!(tt_global_entry->common.flags & BATADV_TT_CLIENT_ROAM); batadv_tt_global_entry_free_ref(tt_global_entry); out: return ret; -- 1.7.12

10 years, 6 months

[B.A.T.M.A.N.] [PATCH] batman-adv: check for more space before accessing the skb

by Antonio Quartulli

In batadv_check_unicast_ttvn() the code accesses both the unicast header and the Ethernet header in the payload. For this reason pskb_may_pull() must be invoked to check for the required space. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- routing.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/routing.c b/routing.c index 784e9cc..44109cc 100644 --- a/routing.c +++ b/routing.c @@ -908,8 +908,12 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, bool tt_poss_change; int is_old_ttvn; - /* I could need to modify it */ - if (skb_cow(skb, sizeof(struct batadv_unicast_packet)) < 0) + /* check if there is enough data before accessing it */ + if (pskb_may_pull(skb, sizeof(*unicast_packet) + ETH_HLEN) < 0) + return 0; + + /* create a copy of the skb (in case of for re-routing) to modify it. */ + if (skb_cow(skb, sizeof(*unicast_packet)) < 0) return 0; unicast_packet = (struct batadv_unicast_packet *)skb->data; -- 1.7.12

10 years, 6 months

[B.A.T.M.A.N.] [PATCHv3] batman-adv: print packets re-routing on DBG_TT and ratelimit it

by Antonio Quartulli

To simplify TranslationTable debugging it is better to print the packet rerouting message on the DBG_TT log level. In this way a developer interested in packets rerouting doesn't need to filter it out of the whole ROUTES log. Moreover, since this message will appear for each rerouted message, it is now "ratelimited". Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- v3: - added net_ratelimited_function() macro to compat.h compat.h | 10 ++++++++++ routing.c | 8 ++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/compat.h b/compat.h index 8ac22a8..14969e0 100644 --- a/compat.h +++ b/compat.h @@ -149,4 +149,14 @@ static inline void eth_hw_addr_random(struct net_device *dev) #endif /* < KERNEL_VERSION(3, 4, 0) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0) + +#define net_ratelimited_function(func, ...) \ + do { \ + if (net_ratelimit()) \ + func(__VA_ARGS__); \ + } while (0) + +#endif /* < KERNEL_VERSION(3, 5, 0) */ + #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ diff --git a/routing.c b/routing.c index 1c545f6..784e9cc 100644 --- a/routing.c +++ b/routing.c @@ -965,10 +965,10 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, batadv_orig_node_free_ref(orig_node); } - batadv_dbg(BATADV_DBG_ROUTES, bat_priv, - "TTVN mismatch (old_ttvn %u new_ttvn %u)! Rerouting unicast packet (for %pM) to %pM\n", - unicast_packet->ttvn, curr_ttvn, ethhdr->h_dest, - unicast_packet->dest); + net_ratelimited_function(batadv_dbg, BATADV_DBG_TT, bat_priv, + "TTVN mismatch (old_ttvn %u new_ttvn %u)! Rerouting unicast packet (for %pM) to %pM\n", + unicast_packet->ttvn, curr_ttvn, + ethhdr->h_dest, unicast_packet->dest); unicast_packet->ttvn = curr_ttvn; } -- 1.7.12

10 years, 6 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N September 2012