[net v2 1/1] tipc: fix cancellation of topology subscriptions

[net v2 1/1] tipc: fix cancellation of topology subscriptions

[Jon Maloy]

From: Erik Hugne <erik.hugne@gmail.com>

When cancelling a subscription, we have to clear the cancel bit in the
request before iterating over any established subscriptions with memcmp.
Otherwise no subscription will ever be found, and it will not be
possible to explicitly unsubscribe individual subscriptions.

Fixes: 8985ecc7c1e0 ("tipc: simplify endianness handling in topology subscriber")
Signed-off-by: Erik Hugne <erik.hugne@gmail.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>

---
v2: clear bit in a more sensible way.. (comment from davem)
---
 net/tipc/topsrv.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net/tipc/topsrv.c b/net/tipc/topsrv.c
index 4a708a4..b45932d7 100644
--- a/net/tipc/topsrv.c
+++ b/net/tipc/topsrv.c
@@ -363,6 +363,7 @@ static int tipc_conn_rcv_sub(struct tipc_topsrv *srv,
 	struct tipc_subscription *sub;
 
 	if (tipc_sub_read(s, filter) & TIPC_SUB_CANCEL) {
+		s->filter &= __constant_ntohl(~TIPC_SUB_CANCEL);
 		tipc_conn_delete_sub(con, s);
 		return 0;
 	}
-- 
2.1.4

Re: [net v2 1/1] tipc: fix cancellation of topology subscriptions

[David Miller]

From: Jon Maloy <jon.maloy@ericsson.com>
Date: Thu, 21 Mar 2019 09:11:59 +0100

> From: Erik Hugne <erik.hugne@gmail.com>
> 
> When cancelling a subscription, we have to clear the cancel bit in the
> request before iterating over any established subscriptions with memcmp.
> Otherwise no subscription will ever be found, and it will not be
> possible to explicitly unsubscribe individual subscriptions.
> 
> Fixes: 8985ecc7c1e0 ("tipc: simplify endianness handling in topology subscriber")
> Signed-off-by: Erik Hugne <erik.hugne@gmail.com>
> Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
> 
> ---
> v2: clear bit in a more sensible way.. (comment from davem)

Applied and queued up for -stable.

Thanks for following up.