diff options
| author |   Erik Hugne <erik.hugne@gmail.com> | 2019-03-21 09:11:59 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-03-21 09:09:04 -0700 |
| commit | 33872d79f5d1cbedaaab79669cc38f16097a9450 (patch) | |
| tree | cf20ae35cad162b95da2e85929ce7fb8af71fe52 /net/tipc/topsrv.c | |
| parent | dpaa2-eth: Fix possible access beyond end of array (diff) | |
| download | linux-dev-33872d79f5d1cbedaaab79669cc38f16097a9450.tar.xz linux-dev-33872d79f5d1cbedaaab79669cc38f16097a9450.zip | |
tipc: fix cancellation of topology subscriptions
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/topsrv.c')
| -rw-r--r-- | net/tipc/topsrv.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/tipc/topsrv.c b/net/tipc/topsrv.c index 4a708a4e8583..b45932d78004 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; } |