Commit 52383678 authored by Ralf Baechle's avatar Ralf Baechle Committed by David S. Miller

[NETROM]: Fix possible null pointer dereference.

If in nr_link_failed the neighbour list is non-empty but the node list
is empty we'll end dereferencing a  in a NULL pointer.

This fixes coverity 362.
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 068c6e98
...@@ -725,15 +725,17 @@ void nr_link_failed(ax25_cb *ax25, int reason) ...@@ -725,15 +725,17 @@ void nr_link_failed(ax25_cb *ax25, int reason)
struct nr_node *nr_node = NULL; struct nr_node *nr_node = NULL;
spin_lock_bh(&nr_neigh_list_lock); spin_lock_bh(&nr_neigh_list_lock);
nr_neigh_for_each(s, node, &nr_neigh_list) nr_neigh_for_each(s, node, &nr_neigh_list) {
if (s->ax25 == ax25) { if (s->ax25 == ax25) {
nr_neigh_hold(s); nr_neigh_hold(s);
nr_neigh = s; nr_neigh = s;
break; break;
} }
}
spin_unlock_bh(&nr_neigh_list_lock); spin_unlock_bh(&nr_neigh_list_lock);
if (nr_neigh == NULL) return; if (nr_neigh == NULL)
return;
nr_neigh->ax25 = NULL; nr_neigh->ax25 = NULL;
ax25_cb_put(ax25); ax25_cb_put(ax25);
...@@ -743,11 +745,13 @@ void nr_link_failed(ax25_cb *ax25, int reason) ...@@ -743,11 +745,13 @@ void nr_link_failed(ax25_cb *ax25, int reason)
return; return;
} }
spin_lock_bh(&nr_node_list_lock); spin_lock_bh(&nr_node_list_lock);
nr_node_for_each(nr_node, node, &nr_node_list) nr_node_for_each(nr_node, node, &nr_node_list) {
nr_node_lock(nr_node); nr_node_lock(nr_node);
if (nr_node->which < nr_node->count && nr_node->routes[nr_node->which].neighbour == nr_neigh) if (nr_node->which < nr_node->count &&
nr_node->routes[nr_node->which].neighbour == nr_neigh)
nr_node->which++; nr_node->which++;
nr_node_unlock(nr_node); nr_node_unlock(nr_node);
}
spin_unlock_bh(&nr_node_list_lock); spin_unlock_bh(&nr_node_list_lock);
nr_neigh_put(nr_neigh); nr_neigh_put(nr_neigh);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment