Skip to content

Commit

Permalink
tipc: drop subscriber connection id invalidation
Browse files Browse the repository at this point in the history
When a topology server subscriber is disconnected, the associated
connection id is set to zero. A check vs zero is then done in the
subscription timeout function to see if the subscriber have been
shut down. This is unnecessary, because all subscription timers
will be cancelled when a subscriber terminates. Setting the
connection id to zero is actually harmful because id zero is the
identity of the topology server listening socket, and can cause a
race that leads to this socket being closed instead.

Signed-off-by: Erik Hugne <erik.hugne@ericsson.com>
Acked-by: Ying Xue <ying.xue@windriver.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Erik Hugne authored and David S. Miller committed Mar 6, 2014
1 parent fe8e464 commit edcc051
Showing 1 changed file with 0 additions and 11 deletions.
11 changes: 0 additions & 11 deletions net/tipc/subscr.c
Original file line number Diff line number Diff line change
Expand Up @@ -149,14 +149,6 @@ static void subscr_timeout(struct tipc_subscription *sub)
/* The spin lock per subscriber is used to protect its members */
spin_lock_bh(&subscriber->lock);

/* Validate if the connection related to the subscriber is
* closed (in case subscriber is terminating)
*/
if (subscriber->conid == 0) {
spin_unlock_bh(&subscriber->lock);
return;
}

/* Validate timeout (in case subscription is being cancelled) */
if (sub->timeout == TIPC_WAIT_FOREVER) {
spin_unlock_bh(&subscriber->lock);
Expand Down Expand Up @@ -211,9 +203,6 @@ static void subscr_release(struct tipc_subscriber *subscriber)

spin_lock_bh(&subscriber->lock);

/* Invalidate subscriber reference */
subscriber->conid = 0;

/* Destroy any existing subscriptions for subscriber */
list_for_each_entry_safe(sub, sub_temp, &subscriber->subscription_list,
subscription_list) {
Expand Down

0 comments on commit edcc051

Please sign in to comment.