From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Ahern Subject: [PATCH iproute2-next 5/5] bridge: fdb: Fix filtering with strict checking disabled Date: Wed, 2 Jan 2019 20:38:32 -0800 Message-ID: <20190103043832.3748-6-dsahern@kernel.org> References: <20190103043832.3748-1-dsahern@kernel.org> Cc: idosch@mellanox.com, stephen@networkplumber.org, David Ahern To: netdev@vger.kernel.org Return-path: Received: from mail.kernel.org ([198.145.29.99]:34052 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729272AbfACEig (ORCPT ); Wed, 2 Jan 2019 23:38:36 -0500 In-Reply-To: <20190103043832.3748-1-dsahern@kernel.org> Sender: netdev-owner@vger.kernel.org List-ID: From: David Ahern Older kernels expect an ifinfomsg struct as the ancillary header, and after kernel commit bd961c9bc664 ("rtnetlink: fix rtnl_fdb_dump() for ndmsg header") can handle either ifinfomsg or ndmsg. Strict data checking only allows ndmsg. Use the new RTNL_HANDLE_F_STRICT_CHK flag to know which header to send. Signed-off-by: David Ahern --- bridge/fdb.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/bridge/fdb.c b/bridge/fdb.c index 676267e15ddc..a0fdac00e094 100644 --- a/bridge/fdb.c +++ b/bridge/fdb.c @@ -256,6 +256,25 @@ int print_fdb(struct nlmsghdr *n, void *arg) return 0; } +static int fdb_linkdump_filter(struct nlmsghdr *nlh, int reqlen) +{ + int err; + + if (filter_index) { + struct ifinfomsg *ifm = NLMSG_DATA(nlh); + + ifm->ifi_index = filter_index; + } + + if (filter_master) { + err = addattr32(nlh, reqlen, IFLA_MASTER, filter_master); + if (err) + return err; + } + + return 0; +} + static int fdb_dump_filter(struct nlmsghdr *nlh, int reqlen) { int err; @@ -279,6 +298,7 @@ static int fdb_show(int argc, char **argv) { char *filter_dev = NULL; char *br = NULL; + int rc; while (argc > 0) { if ((strcmp(*argv, "brport") == 0) || strcmp(*argv, "dev") == 0) { @@ -323,7 +343,12 @@ static int fdb_show(int argc, char **argv) return nodev(filter_dev); } - if (rtnl_neighdump_req(&rth, PF_BRIDGE, fdb_dump_filter) < 0) { + 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); + if (rc < 0) { perror("Cannot send dump request"); exit(1); } -- 2.11.0