From patchwork Fri Jan 25 17:09:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 1031209 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="xUv9Jomb"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43mQVW3DsTz9s7h for ; Sat, 26 Jan 2019 04:09:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729071AbfAYRJW (ORCPT ); Fri, 25 Jan 2019 12:09:22 -0500 Received: from mail-eopbgr80041.outbound.protection.outlook.com ([40.107.8.41]:10368 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726311AbfAYRJV (ORCPT ); Fri, 25 Jan 2019 12:09:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kk6qCb8ENVgnf6LQDV6xvvZZPW7q2CperbR0cV9H5zY=; b=xUv9Jomb7p/d0QfsamKqvspqUTPMk9s4PYMpt2zxZDUBy2b9NJ/gSFhIwGpf+gvLECU0MEpTxruFUtItfTL+astS10rNRJB4cv16HddTmQnVXnKMduZS2c9ypBXgq8K+vPUpwOJ6Tx5/DjGNB9j8RsXNYz27oh1zaeJv+oSeaqE= Received: from DB7PR05MB4940.eurprd05.prod.outlook.com (20.176.235.152) by DB7PR05MB4330.eurprd05.prod.outlook.com (52.134.108.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.29; Fri, 25 Jan 2019 17:09:17 +0000 Received: from DB7PR05MB4940.eurprd05.prod.outlook.com ([fe80::6161:97fd:d315:7b07]) by DB7PR05MB4940.eurprd05.prod.outlook.com ([fe80::6161:97fd:d315:7b07%6]) with mapi id 15.20.1558.021; Fri, 25 Jan 2019 17:09:17 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "stephen@networkplumber.org" , "dsahern@gmail.com" , "ivecera@redhat.com" , "liali@redhat.com" , mlxsw , Ido Schimmel Subject: [PATCH iproute2-master] bridge: fdb: Fix FDB dump with strict checking disabled Thread-Topic: [PATCH iproute2-master] bridge: fdb: Fix FDB dump with strict checking disabled Thread-Index: AQHUtNC0Wyx19Ov3yUyJ9u31uwPk5A== Date: Fri, 25 Jan 2019 17:09:17 +0000 Message-ID: <20190125170837.6434-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM5PR0201CA0007.eurprd02.prod.outlook.com (2603:10a6:203:3d::17) To DB7PR05MB4940.eurprd05.prod.outlook.com (2603:10a6:10:1e::24) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [79.178.93.51] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB7PR05MB4330; 6:1G1V1UBAHfm+eSZTdK2WKxy3VFlUrHWt4eoxjd2biavkZB8LmQBUiaMWybiU/2paDGr/QNvdZjJto02WsmFTIsOb4rlNh8ru2CHvjpxcrRWy2img9n8Q1CGhyBPAI2kU0+P4SQPHH1v2KlxzQoYDZU+xQvNl+7meoEoH7GcsDVfFeletlVM08b5E2yJdcbFDLWZbGDVx23q1ZrdZNJ0kGlw1gN2rc02kP7K/XY9dvj4h+YAGf0C4FQoWL1D3McRNevAkdbIy/t8Xja7HyAXkuD+zxOO365FVfngUJzZKs0A42qzvY7roV4LPOC6hPyAjATk9XseLN9GeG/JmUeN3H8m9F6ytyWybniL1Cg0phhT1HKBBwDhuT9545mH93GHM9vbLphOUKXjTyxdzayoFJbUoNU0rHzTQHPZ86ocrna46iv4uqnzvOlHKmvu2ki6XlTbOR/4WseeIoCHMGNu9eQ==; 5:HFlt8kfcWTx2XlTcEhAb2i8bWGFa7gEfF3yFunjYJxjLCTQJA52mAeiD5Sd1VLA8UtsYlgcwuUzt9gdamcanUkem37M6/5q9zBbMMnZh0dBXFUNwGyPpUBsVZcpbM0U7CV4lx6PanFZJdIhy7rvuhWgarl3aIKXdgMMQYzfZC0JhTLVZWpAPaORu2Vsx57mPg8wBJlVjE4wtxYGY4b/rZA==; 7:WHHZv3qJv0tpvcLNnzGy5UJyDSt+Vf9x6/s/h2bq7sq5sAC5yEfabBPLvNYoLAv0Z9y8VraDwLnu3aqNtIKM6a0Gut5LGqb6LwmTpBDY90oELfLjH45YfC/oz3wROhXn5j8cfrVi3eqnWTidgtBmdw== x-ms-office365-filtering-correlation-id: 22986b23-fb70-4528-d847-08d682e7d68d x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB7PR05MB4330; x-ms-traffictypediagnostic: DB7PR05MB4330: x-microsoft-antispam-prvs: x-forefront-prvs: 0928072091 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(346002)(136003)(376002)(396003)(39860400002)(189003)(199004)(26005)(50226002)(186003)(39060400002)(2501003)(86362001)(71200400001)(71190400001)(305945005)(7736002)(52116002)(106356001)(105586002)(5640700003)(8936002)(36756003)(6486002)(99286004)(68736007)(25786009)(8676002)(102836004)(81156014)(81166006)(1730700003)(14444005)(256004)(486006)(2616005)(476003)(4326008)(6916009)(6116002)(386003)(6506007)(1076003)(6512007)(107886003)(3846002)(2906002)(97736004)(14454004)(6436002)(2351001)(316002)(66066001)(53936002)(478600001)(54906003); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR05MB4330; H:DB7PR05MB4940.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: RI/9TDoQisZ6LKRlX2af6otw0e5Lzf9+gD8JEL/dHT/eUUlt5fPfGLa36iJPcDHz1OPyYtV7NbbDdbnHRGtJKmMjE7I2O0JTwerOLh22jmJ9ihJG7MPKtRx1tOnNuoYxnm1shvQG9BPfl7t4vdc+BkQx6zH6vlrCFaO92NPtNaFI6tgz3JYq3ZxzAmgB/ydjihmU3yeLlwq6JnyvTLSaZ70T9xd161rY7UX63s5Ie3WZbTc0UgAHatK7IjC5l6xJxrQ8XqdyQp3SNyFDTVc9SZVuVXPb37ub+svFeaEEh1Fw1hCteUDVn9gRtSv3y5cxyUVmwz9xRCe2zjx5kp9kHKSwxTs/89RT813gNG6Mp9O/JssEv8xF8X7E3AISerf/Ny9C8FfMKWWIAw8d18am5bjSp3lUyQGQnJ8lmogeJ+I= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 22986b23-fb70-4528-d847-08d682e7d68d X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Jan 2019 17:09:15.9744 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR05MB4330 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org While iproute2 correctly uses ifinfomsg struct as the ancillary header when requesting an FDB dump on old kernels, it sets the message type to RTM_GETLINK. This results in wrong reply being returned. Fix this by using RTM_GETNEIGH instead. Before: $ bridge fdb show brport dummy0 Not RTM_NEWNEIGH: 00000158 00000010 00000002 After: $ bridge fdb show brport dummy0 2a:0b:41:1c:92:d3 vlan 1 master br0 permanent 2a:0b:41:1c:92:d3 master br0 permanent 33:33:00:00:00:01 self permanent 01:00:5e:00:00:01 self permanent Fixes: 05880354c2cf ("bridge: fdb: Fix filtering with strict checking disabled") Signed-off-by: Ido Schimmel Reported-by: LiLiang Acked-by: David Ahern Acked-by: Ivan Vecera --- bridge/fdb.c | 3 +-- include/libnetlink.h | 3 +++ lib/libnetlink.c | 23 +++++++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/bridge/fdb.c b/bridge/fdb.c index f75e953a80e2..c4bf40390f42 100644 --- a/bridge/fdb.c +++ b/bridge/fdb.c @@ -346,8 +346,7 @@ static int fdb_show(int argc, char **argv) if (rth.flags & RTNL_HANDLE_F_STRICT_CHK) rc = rtnl_neighdump_req(&rth, PF_BRIDGE, fdb_dump_filter); else - rc = rtnl_linkdump_req_filter_fn(&rth, PF_BRIDGE, - fdb_linkdump_filter); + rc = rtnl_fdb_linkdump_req_filter_fn(&rth, fdb_linkdump_filter); if (rc < 0) { perror("Cannot send dump request"); exit(1); diff --git a/include/libnetlink.h b/include/libnetlink.h index 0854d6ad2fab..503b3ec11bb6 100644 --- a/include/libnetlink.h +++ b/include/libnetlink.h @@ -81,6 +81,9 @@ int rtnl_linkdump_req_filter(struct rtnl_handle *rth, int fam, __u32 filt_mask) int rtnl_linkdump_req_filter_fn(struct rtnl_handle *rth, int fam, req_filter_fn_t fn) __attribute__((warn_unused_result)); +int rtnl_fdb_linkdump_req_filter_fn(struct rtnl_handle *rth, + req_filter_fn_t filter_fn) + __attribute__((warn_unused_result)); int rtnl_statsdump_req_filter(struct rtnl_handle *rth, int fam, __u32 filt_mask) __attribute__((warn_unused_result)); int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, diff --git a/lib/libnetlink.c b/lib/libnetlink.c index 110f47bcd65a..7b392862cb91 100644 --- a/lib/libnetlink.c +++ b/lib/libnetlink.c @@ -503,6 +503,29 @@ int rtnl_linkdump_req_filter_fn(struct rtnl_handle *rth, int family, return __rtnl_linkdump_req(rth, family); } +int rtnl_fdb_linkdump_req_filter_fn(struct rtnl_handle *rth, + req_filter_fn_t filter_fn) +{ + struct { + struct nlmsghdr nlh; + struct ifinfomsg ifm; + char buf[128]; + } req = { + .nlh.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg)), + .nlh.nlmsg_type = RTM_GETNEIGH, + .nlh.nlmsg_flags = NLM_F_DUMP | NLM_F_REQUEST, + .nlh.nlmsg_seq = rth->dump = ++rth->seq, + .ifm.ifi_family = PF_BRIDGE, + }; + int err; + + err = filter_fn(&req.nlh, sizeof(req)); + if (err) + return err; + + return send(rth->fd, &req, sizeof(req), 0); +} + int rtnl_statsdump_req_filter(struct rtnl_handle *rth, int fam, __u32 filt_mask) { struct {