Skip to content

Commit

Permalink
tipc: fix cleanup at module unload
Browse files Browse the repository at this point in the history
In tipc_server_stop(), we iterate over the connections with limiting
factor as server's idr_in_use. We ignore the fact that this variable
is decremented in tipc_close_conn(), leading to premature exit.

In this commit, we iterate until the we have no connections left.

Acked-by: Ying Xue <ying.xue@windriver.com>
Acked-by: Jon Maloy <jon.maloy@ericsson.com>
Tested-by: John Thompson <thompa.atl@gmail.com>
Signed-off-by: Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Parthasarathy Bhuvaragan authored and David S. Miller committed Jan 24, 2017
1 parent 4c887aa commit 35e22e4
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions net/tipc/server.c
Original file line number Diff line number Diff line change
Expand Up @@ -619,14 +619,12 @@ int tipc_server_start(struct tipc_server *s)
void tipc_server_stop(struct tipc_server *s)
{
struct tipc_conn *con;
int total = 0;
int id;

spin_lock_bh(&s->idr_lock);
for (id = 0; total < s->idr_in_use; id++) {
for (id = 0; s->idr_in_use; id++) {
con = idr_find(&s->conn_idr, id);
if (con) {
total++;
spin_unlock_bh(&s->idr_lock);
tipc_close_conn(con);
spin_lock_bh(&s->idr_lock);
Expand Down

0 comments on commit 35e22e4

Please sign in to comment.