path: root/net
diff options
authorErik Hugne <erik.hugne@ericsson.com>2014-03-06 14:40:19 +0100
committerDavid S. Miller <davem@davemloft.net>2014-03-06 14:46:23 -0500
commitedcc0511b5ee7235282a688cd604e3ae7f9e1fc9 (patch)
tree08ca164fb87ec0848efef992466a08d6469bbb8b /net
parentfe8e4649397915cf3b2ab0b695929a27e543967e (diff)
tipc: drop subscriber connection id invalidation
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>
Diffstat (limited to 'net')
1 files changed, 0 insertions, 11 deletions
diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
index a6ce3bbf3ea..11c9ae00837 100644
--- a/net/tipc/subscr.c
+++ b/net/tipc/subscr.c
@@ -149,14 +149,6 @@ static void subscr_timeout(struct tipc_subscription *sub)
/* The spin lock per subscriber is used to protect its members */
- /* 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) {
@@ -211,9 +203,6 @@ static void subscr_release(struct tipc_subscriber *subscriber)
- /* 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) {