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

Commit 6ce995c6 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge 



Included changes:
- prevent NULL dereference in multicast code

Antonion Quartulli says:

====================
pull request net: batman-adv 20140527

here you have another very small fix intended for net/linux-3.15.
It prevents some multicast functions from dereferencing a NULL pointer.
(Actually it was nothing more than a typo)
I hope it is not too late for such a small patch.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents dbfc4b69 af0a171c

net/batman-adv/multicast.c

+3 −3
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ batadv_mcast_forw_ipv4_node_get(struct batadv_priv *bat_priv) 
	hlist_for_each_entry_rcu(tmp_orig_node,

				 &bat_priv->mcast.want_all_ipv4_list,

				 mcast_want_all_ipv4_node) {

		if (!atomic_inc_not_zero(&orig_node->refcount))

		if (!atomic_inc_not_zero(&tmp_orig_node->refcount))

			continue;



		orig_node = tmp_orig_node;
@@ -442,7 +442,7 @@ batadv_mcast_forw_ipv6_node_get(struct batadv_priv *bat_priv) 
	hlist_for_each_entry_rcu(tmp_orig_node,

				 &bat_priv->mcast.want_all_ipv6_list,

				 mcast_want_all_ipv6_node) {

		if (!atomic_inc_not_zero(&orig_node->refcount))

		if (!atomic_inc_not_zero(&tmp_orig_node->refcount))

			continue;



		orig_node = tmp_orig_node;
@@ -493,7 +493,7 @@ batadv_mcast_forw_unsnoop_node_get(struct batadv_priv *bat_priv) 
	hlist_for_each_entry_rcu(tmp_orig_node,

				 &bat_priv->mcast.want_all_unsnoopables_list,

				 mcast_want_all_unsnoopables_node) {

		if (!atomic_inc_not_zero(&orig_node->refcount))

		if (!atomic_inc_not_zero(&tmp_orig_node->refcount))

			continue;



		orig_node = tmp_orig_node;