[commits] batman-adv; branch, master, updated. v2010.1.0-169-gaecf54d

postmaster at open-mesh.org postmaster at open-mesh.org
Sat Sep 18 17:35:47 CEST 2010


The following commit has been merged in the master branch:
commit 2b6a7a5586c180458400beecb13e3c7ec573bb00
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Sat Sep 18 15:35:35 2010 +0000

    batman-adv: Always protect list_for_each_entry_rcu with RCU
    
    receive_bat_packet is not called with rcu_read_lock so we must ensure by
    ourself that we protect list_for_each_entry_rcu using the correct RCU
    locks.
    
    Signed-off-by: Sven Eckelmann <sven.eckelmann at gmx.de>

diff --git a/routing.c b/routing.c
index 603a932..1781b7e 100644
--- a/routing.c
+++ b/routing.c
@@ -575,6 +575,7 @@ void receive_bat_packet(struct ethhdr *ethhdr,
 		batman_packet->tq, batman_packet->ttl, batman_packet->version,
 		has_directlink_flag);
 
+	rcu_read_lock();
 	list_for_each_entry_rcu(batman_if, &if_list, list) {
 		if (batman_if->if_status != IF_ACTIVE)
 			continue;
@@ -597,6 +598,7 @@ void receive_bat_packet(struct ethhdr *ethhdr,
 		if (compare_orig(ethhdr->h_source, broadcast_addr))
 			is_broadcast = 1;
 	}
+	rcu_read_unlock();
 
 	if (batman_packet->version != COMPAT_VERSION) {
 		bat_dbg(DBG_BATMAN, bat_priv,

-- 
batman-adv


More information about the commits mailing list