From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0288C43381 for ; Thu, 21 Mar 2019 08:12:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B7690218A5 for ; Thu, 21 Mar 2019 08:12:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ericsson.com header.i=@ericsson.com header.b="IZ/az6ZL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727926AbfCUIMD (ORCPT ); Thu, 21 Mar 2019 04:12:03 -0400 Received: from sesbmg23.ericsson.net ([193.180.251.37]:46836 "EHLO sesbmg23.ericsson.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727823AbfCUIMC (ORCPT ); Thu, 21 Mar 2019 04:12:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; d=ericsson.com; s=mailgw201801; c=relaxed/relaxed; q=dns/txt; i=@ericsson.com; t=1553155919; x=1555747919; h=From:Sender:Reply-To:Subject:Date:Message-ID:To:CC:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=DxZlbRrTFK9gmnISwUmYNGloafpqN02o4N8GA1VQbp8=; b=IZ/az6ZLFZWMDCjeU+TTZcxZeWBfphzYJBQ/LSzq4Rw63hiruSlOHOW8Fa236x9l 5KzCgiXbttl1iX1Pls68bC2d8cnXzuaYgq6U14NkjM9EA06jL7Q4qxPxq6LhK3A4 mMSPVPSeDI1y7P7nLeIglb+cpKqS5srTiUcKW4acgVA=; X-AuditID: c1b4fb25-d89ff70000005ff7-47-5c93474f8ef0 Received: from ESESBMB501.ericsson.se (Unknown_Domain [153.88.183.114]) by sesbmg23.ericsson.net (Symantec Mail Security) with SMTP id 1B.67.24567.F47439C5; Thu, 21 Mar 2019 09:11:59 +0100 (CET) Received: from ESESSMR501.ericsson.se (153.88.183.108) by ESESBMB501.ericsson.se (153.88.183.184) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Thu, 21 Mar 2019 09:11:59 +0100 Received: from ESESBMB503.ericsson.se (153.88.183.170) by ESESSMR501.ericsson.se (153.88.183.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Thu, 21 Mar 2019 09:11:59 +0100 Received: from tipsy.lab.linux.ericsson.se (153.88.183.153) by smtp.internal.ericsson.com (153.88.183.186) with Microsoft SMTP Server id 15.1.1713.5 via Frontend Transport; Thu, 21 Mar 2019 09:11:59 +0100 From: Jon Maloy To: , CC: , , , , , , Subject: [net v2 1/1] tipc: fix cancellation of topology subscriptions Date: Thu, 21 Mar 2019 09:11:59 +0100 Message-ID: <1553155919-20258-1-git-send-email-jon.maloy@ericsson.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Content-Type: text/plain X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrBLMWRmVeSWpSXmKPExsUyM2J7ka6/++QYg40/1S1uNPQwW8w538Ji sWL3JFaLt69msVscWyBmseV8lsWV9rPsFo+vX2d24PDYsvImk8e7K2weuxd8ZvL4vEnOY/2W rUwBrFFcNimpOZllqUX6dglcGQv37WItWMBRcW5dF2MD4zu2LkZODgkBE4k1C9cB2VwcQgJH GCUWLP7EBJIQEvjGKHG7RxAiAWQf6TvPCuFcYJR4teEoWDubgIbEy2kdjCC2iICxxKuVnUwg RcwCjxklvtxfBVYkLOAu8W7uYrAiFgFViY17Z7OA2LwCbhIbHhyCukNO4vzxn8wQq5Ul5n6Y xgRRIyhxcuYTsHpmAQmJgy9eME9g5J+FJDULSWoBI9MqRtHi1OKk3HQjY73Uoszk4uL8PL28 1JJNjMDwPbjlt+oOxstvHA8xCnAwKvHwMrhMjhFiTSwrrsw9xCjBwawkwmtiCxTiTUmsrEot yo8vKs1JLT7EKM3BoiTO+0dIMEZIID2xJDU7NbUgtQgmy8TBKdXAWHXrg5drQ23ooWXiQlNO ld1NCgz8O++wtwpDU35LtEqc2rGpFpN/Fu+54ZQTJqbmaHy12kTy+jNG5ZmWrIfKZSet/BW3 OEHi2K1+Tt2FCifE1xwIP7IpRtHXO9rjyo0dzTHa2melH2hEzX64/tfcmYxPnRtUKw35M2++ l3sz5ZKm/5ZvljG3lFiKMxINtZiLihMBWL4KBlsCAAA= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Erik Hugne 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 Signed-off-by: Jon Maloy --- 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