Skip to content

Commit

Permalink
batman-adv: Only increase refcounter once for alternate router
Browse files Browse the repository at this point in the history
The test whether we can use a router for alternating bonding should only be
done once because it is already known that it is still usable and will not be
deleted from the list soon.

This patch addresses Coverity #712285: Unchecked return value

Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
  • Loading branch information
Sven Eckelmann authored and Antonio Quartulli committed Oct 29, 2012
1 parent bd5b80d commit fe3f4cf
Showing 1 changed file with 8 additions and 15 deletions.
23 changes: 8 additions & 15 deletions net/batman-adv/routing.c
Original file line number Diff line number Diff line change
Expand Up @@ -549,25 +549,18 @@ batadv_find_ifalter_router(struct batadv_orig_node *primary_orig,
if (tmp_neigh_node->if_incoming == recv_if)
continue;

if (!atomic_inc_not_zero(&tmp_neigh_node->refcount))
if (router && tmp_neigh_node->tq_avg <= router->tq_avg)
continue;

/* if we don't have a router yet
* or this one is better, choose it.
*/
if ((!router) ||
(tmp_neigh_node->tq_avg > router->tq_avg)) {
/* decrement refcount of
* previously selected router
*/
if (router)
batadv_neigh_node_free_ref(router);
if (!atomic_inc_not_zero(&tmp_neigh_node->refcount))
continue;

router = tmp_neigh_node;
atomic_inc_not_zero(&router->refcount);
}
/* decrement refcount of previously selected router */
if (router)
batadv_neigh_node_free_ref(router);

batadv_neigh_node_free_ref(tmp_neigh_node);
/* we found a better router (or at least one valid router) */
router = tmp_neigh_node;
}

/* use the first candidate if nothing was found. */
Expand Down

0 comments on commit fe3f4cf

Please sign in to comment.