Re: [B.A.T.M.A.N.] [PATCHv2 next] batman-adv: fix NULL pointer dereferences

Linus Lüssing
2014-05-02T04:52:55Z

Signed-off-by: Linus Lüssing <linus.luessing@web.de>

On Thu, Apr 24, 2014 at 03:41:26AM +0800, Marek Lindner wrote:
> Reported-by: Sven Eckelmann <sven@narfation.org>
> Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
> ---
>
> Changes from v1:
> - add next branch indication
>
> multicast.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/multicast.c b/multicast.c
> index 8c7ca81..96b66fd 100644
> --- a/multicast.c
> +++ b/multicast.c
> @@ -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;
> --
> 2.0.0.rc0
>