Skip to contentSkip to conversation

batman-adv: Fix NULL pointer dereference in DAT hash collision avoidance

PATCH Applied Pau Koning 3 participants 3 messages Feb 12, 2013 – Feb 15, 2013

Subsystems (3)
lore
Share & tools
lore

Pau Koning

author
#0 lore raw

PATCH 1/1 batman-adv: Fix NULL pointer dereference in DAT hash collision avoidance

An entry in DAT with the hashed position of 0 can cause a NULL pointer dereference when the first entry is checked by batadv_choose_next_candidate. This first candidate automatically has the max value of 0 and the max_orig_node of NULL. Not checking max_orig_node for NULL in batadv_is_orig_node_eligible will lead to a NULL pointer dereference when checking for the lowest address.

This problem was added in 785ea1144182c341b8b85b0f8180291839d176a8 ("batman-adv: Distributed ARP Table - create DHT helper functions").

---
 net/batman-adv/distributed-arp-table.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/batman-adv/distributed-arp-table.c +1 -1
index 0e05ad4..d54188a 100644
@@ -439,7 +439,7 @@ static bool batadv_is_orig_node_eligible(struct batadv_dat_candidate *res,
 	/* this is an hash collision with the temporary selected node. Choose
 	 * the one with the lowest address
 	 */
-	if ((tmp_max == max) &&
+	if ((tmp_max == max) && max_orig_node &&
 	    (batadv_compare_eth(candidate->orig, max_orig_node->orig) > 0))
 		goto out;
 
Signature · 1 line
1.7.10.4
maintainer Applied
#1 lore raw

From: Pau Koning <[email protected]>
Date: Tue, 12 Feb 2013 11:18:45 +0100

Quoted 10 lines

An entry in DAT with the hashed position of 0 can cause a NULL pointer dereference when the first entry is checked by batadv_choose_next_candidate. This first candidate automatically has the max value of 0 and the max_orig_node of NULL. Not checking max_orig_node for NULL in batadv_is_orig_node_eligible will lead to a NULL pointer dereference when checking for the lowest address.

This problem was added in 785ea1144182c341b8b85b0f8180291839d176a8 ("batman-adv: Distributed ARP Table - create DHT helper functions").

Applied.

#2 lore raw
In reply to Pau Koning
Quoted 10 lines · Pau Koning

An entry in DAT with the hashed position of 0 can cause a NULL pointer dereference when the first entry is checked by batadv_choose_next_candidate. This first candidate automatically has the max value of 0 and the max_orig_node of NULL. Not checking max_orig_node for NULL in batadv_is_orig_node_eligible will lead to a NULL pointer dereference when checking for the lowest address.

This problem was added in 785ea1144182c341b8b85b0f8180291839d176a8 ("batman-adv: Distributed ARP Table - create DHT helper functions").

Hello Pau,

thank you very much for this fix, this was not an easy one!

However, next time please CC our mailing list as well (get_maintainer.pl will give you all the needed addresses), otherwise it may be the case that we overlook such patches and:
1) we don't review it
2) we don't merge it into our repository (which is where the real development goes on).

Both 1) and 2) happened with this patch and, in my humble opinion, it is not a good idea to merge such delicate fixes without having a reply from the maintainers.

Therefore, please keep us in the loop when sending patches. It would be really appreciated.

Regards,

Signature · 4 lines
Antonio Quartulli

..each of us alone is worth nothing..
Ernesto "Che" Guevara