proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-08-14 11:25:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bridge: fdb: Fix filtering with strict checking disabled

Browse Source 
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 <dsahern@gmail.com>
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Tested-by: Ido Schimmel <idosch@mellanox.com>
This commit is contained in:
David Ahern 2019-01-02 16:33:42 -08:00
parent 285033bfeb
commit 05880354c2
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
bridge/fdb.c
View File

@ -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);
}