net: bridge: vlan: Fix dumping with ifindex
Subsystems (3)
PATCH 1/1 net: bridge: vlan: Fix dumping with ifindex
Specifying ifindex in a RTM_GETVLAN dump leads to an infinite repetition of the same entries. netlink_dump() normally calls the dump function repeatedly until it returns 0 which br_vlan_rtm_dump() never does in that case.
--- net/bridge/br_vlan.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
The problem can be reproduced by using the following iproute2 patch and running:
ip link add br0 type bridge
ip link add dummy0 master br0 type dummy
bridge vlan add dev dummy0 vid 100
./bridge/bridge -d vlan show dev dummy0
[infinite loop]
diff --git a/bridge/vlan.c b/bridge/vlan.c
index 8300f353..f206a671 100644
--- a/bridge/vlan.c
+++ b/bridge/vlan.c
@@ -1128,7 +1128,8 @@ static int vlan_show(int argc, char **argv, int subject)
if (show_details && subject == VLAN_SHOW_VLAN) {
__u32 dump_flags = show_stats ? BRIDGE_VLANDB_DUMPF_STATS : 0;
- if (rtnl_brvlandump_req(&rth, PF_BRIDGE, dump_flags) < 0) {
+ if (rtnl_brvlandump_req(&rth, PF_BRIDGE, dump_flags,
+ filter_index) < 0) {
perror("Cannot send dump request");
exit(1);
}
@@ -1240,7 +1241,8 @@ static int vlan_global_show(int argc, char **argv)
new_json_obj(json);
- if (rtnl_brvlandump_req(&rth, PF_BRIDGE, dump_flags) < 0) {
+ if (rtnl_brvlandump_req(&rth, PF_BRIDGE, dump_flags, filter_index)
+ < 0) {
perror("Cannot send dump request");
exit(1);
}
diff --git a/include/libnetlink.h b/include/libnetlink.h
index 9e4cc101..276b7fbf 100644
--- a/include/libnetlink.h
+++ b/include/libnetlink.h
@@ -69,7 +69,8 @@ int rtnl_neightbldump_req(struct rtnl_handle *rth, int family)
__attribute__((warn_unused_result));
int rtnl_mdbdump_req(struct rtnl_handle *rth, int family)
__attribute__((warn_unused_result));
-int rtnl_brvlandump_req(struct rtnl_handle *rth, int family, __u32 dump_flags)
+int rtnl_brvlandump_req(struct rtnl_handle *rth, int family, __u32 dump_flags,
+ int ifindex)
__attribute__((warn_unused_result));
int rtnl_netconfdump_req(struct rtnl_handle *rth, int family)
__attribute__((warn_unused_result));
diff --git a/lib/libnetlink.c b/lib/libnetlink.c
index 7e977a67..e0fce8e5 100644
--- a/lib/libnetlink.c
+++ b/lib/libnetlink.c
@@ -450,7 +450,8 @@ int rtnl_mdbdump_req(struct rtnl_handle *rth, int family)
return send(rth->fd, &req, sizeof(req), 0);
}
-int rtnl_brvlandump_req(struct rtnl_handle *rth, int family, __u32 dump_flags)
+int rtnl_brvlandump_req(struct rtnl_handle *rth, int family, __u32 dump_flags,
+ int ifindex)
{
struct {
struct nlmsghdr nlh;
@@ -462,6 +463,7 @@ int rtnl_brvlandump_req(struct rtnl_handle *rth, int family, __u32 dump_flags)
.nlh.nlmsg_flags = NLM_F_DUMP | NLM_F_REQUEST,
.nlh.nlmsg_seq = rth->dump = ++rth->seq,
.bvm.family = family,
+ .bvm.ifindex = ifindex,
};
addattr32(&req.nlh, sizeof(req), BRIDGE_VLANDB_DUMP_FLAGS, dump_flags);
-- net/bridge/br_vlan.c +4 -2
@@ -2013,7 +2013,7 @@ static int br_vlan_rtm_dump(struct sk_buff *skb, struct netlink_callback *cb) dump_flags =nla_get_u32 (dtb[BRIDGE_VLANDB_DUMP_FLAGS ]);rcu_read_lock (); -if (bvm->ifindex) { +if (bvm->ifindex && !s_idx) { dev =dev_get_by_index_rcu (net, bvm->ifindex);if (!dev) { err = -ENODEV ;
@@ -2022,7 +2022,9 @@ static int br_vlan_rtm_dump(struct sk_buff *skb, struct netlink_callback *cb) err =br_vlan_dump_dev (dev, skb, cb, dump_flags);if (err && err != -EMSGSIZE ) goto out_err; - }else { +else if (!err) + idx++; + }else if (!bvm->ifindex) {for_each_netdev_rcu (net, dev) {if (idx < s_idx) goto skip;
Signature · 1 line
2.34.1
Quoted 11 lines · Benjamin Poirier
Specifying ifindex in a
RTM_GETVLANdump leads to an infinite repetition of the same entries.netlink_dump()normally calls the dump function repeatedly until it returns 0 whichbr_vlan_rtm_dump()never does in that case.Fixes 8dcea187088b ("net: bridge: vlan: add rtm definitions and dump support")Signed-off-by Benjamin Poirier <[email protected]>--- net/bridge/br_vlan.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
[snip]
Quoted 15 lines
net/bridge/br_vlan.c +1
-1@@ -2013,7 +2013,7 @@ static int br_vlan_rtm_dump(struct sk_buff *skb, struct netlink_callback *cb) dump_flags =nla_get_u32 (dtb[BRIDGE_VLANDB_DUMP_FLAGS ]);rcu_read_lock (); -if (bvm->ifindex) { +if (bvm->ifindex && !s_idx) { dev =dev_get_by_index_rcu (net, bvm->ifindex);if (!dev) { err = -ENODEV ;
net/bridge/br_vlan.c static int br_vlan_rtm_dump(struct sk_buff *skb, struct netlink_callback *cb) · line 2030
Quoted 10 lines
net/bridge/br_vlan.c +3
-1@@ -2022,7 +2022,9 @@ static int br_vlan_rtm_dump(struct sk_buff *skb, struct netlink_callback *cb) err =br_vlan_dump_dev (dev, skb, cb, dump_flags);if (err && err != -EMSGSIZE ) goto out_err; - }else { +else if (!err) + idx++; + }else if (!bvm->ifindex) {for_each_netdev_rcu (net, dev) {if (idx < s_idx) goto skip;
Quoted 32 lines · Nikolay Aleksandrov
Quoted 11 lines · Benjamin Poirier
Specifying ifindex in a
RTM_GETVLANdump leads to an infinite repetition of the same entries.netlink_dump()normally calls the dump function repeatedly until it returns 0 whichbr_vlan_rtm_dump()never does in that case.Fixes 8dcea187088b ("net: bridge: vlan: add rtm definitions and dump support")Signed-off-by Benjamin Poirier <[email protected]>--- net/bridge/br_vlan.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)[snip]
Quoted 19 lines
net/bridge/br_vlan.c +1
-2@@ -2013,7 +2013,7 @@ static int br_vlan_rtm_dump(struct sk_buff *skb, struct netlink_callback *cb) dump_flags =nla_get_u32 (dtb[BRIDGE_VLANDB_DUMP_FLAGS ]);rcu_read_lock (); -if (bvm->ifindex) { +if (bvm->ifindex && !s_idx) { dev =dev_get_by_index_rcu (net, bvm->ifindex);if (!dev) { err = -ENODEV ;@@ -2022,7 +2022,9 @@ static int br_vlan_rtm_dump(struct sk_buff *skb, struct netlink_callback *cb) err =br_vlan_dump_dev (dev, skb, cb, dump_flags);if (err && err != -EMSGSIZE ) goto out_err; - }else {
Quoted 8 lines
net/bridge/br_vlan.c static int br_vlan_rtm_dump(struct sk_buff *skb, struct netlink_callback *cb) · line 2030
Quoted 6 lines
net/bridge/br_vlan.c +3
-0+else if (!err) + idx++; + }else if (!bvm->ifindex) {for_each_netdev_rcu (net, dev) {if (idx < s_idx) goto skip;
Actually I'd prefer an alternative that would encapsulate handling the single device dump in its block, avoid all the "else if"s and is simpler (untested):
net/bridge/br_vlan.c +2 -1
@@ -2020,7 +2020,8 @@ static int br_vlan_rtm_dump(struct sk_buff *skb, struct netlink_callback *cb) goto out_err; } err =br_vlan_dump_dev (dev, skb, cb, dump_flags); -if (err && err != -EMSGSIZE ) +/* if the dump completed without an error we return 0 here */ +if (err != -EMSGSIZE ) goto out_err; }else {for_each_netdev_rcu (net, dev) {
Quoted 50 lines · Nikolay Aleksandrov
Quoted 32 lines · Nikolay Aleksandrov
Quoted 11 lines · Benjamin Poirier
Specifying ifindex in a
RTM_GETVLANdump leads to an infinite repetition of the same entries.netlink_dump()normally calls the dump function repeatedly until it returns 0 whichbr_vlan_rtm_dump()never does in that case.Fixes 8dcea187088b ("net: bridge: vlan: add rtm definitions and dump support")Signed-off-by Benjamin Poirier <[email protected]>--- net/bridge/br_vlan.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)[snip]
Quoted 19 lines
net/bridge/br_vlan.c +1
-2@@ -2013,7 +2013,7 @@ static int br_vlan_rtm_dump(struct sk_buff *skb, struct netlink_callback *cb) dump_flags =nla_get_u32 (dtb[BRIDGE_VLANDB_DUMP_FLAGS ]);rcu_read_lock (); -if (bvm->ifindex) { +if (bvm->ifindex && !s_idx) { dev =dev_get_by_index_rcu (net, bvm->ifindex);if (!dev) { err = -ENODEV ;@@ -2022,7 +2022,9 @@ static int br_vlan_rtm_dump(struct sk_buff *skb, struct netlink_callback *cb) err =br_vlan_dump_dev (dev, skb, cb, dump_flags);if (err && err != -EMSGSIZE ) goto out_err; - }else {Quoted 8 lines
net/bridge/br_vlan.c static int br_vlan_rtm_dump(struct sk_buff *skb, struct netlink_callback *cb) · line 2030
Quoted 6 lines
net/bridge/br_vlan.c +3
-0+else if (!err) + idx++; + }else if (!bvm->ifindex) {for_each_netdev_rcu (net, dev) {if (idx < s_idx) goto skip;Actually I'd prefer an alternative that would encapsulate handling the single device dump in its block, avoid all the "else if"s and is simpler (untested):
net/bridge/br_vlan.c +0
-0
net/bridge/br_vlan.c static int br_vlan_rtm_dump(struct sk_buff *skb, struct netlink_callback *cb) · line 2027
Quoted 9 lines
net/bridge/br_vlan.c +2
-1@@ -2020,7 +2020,8 @@ static int br_vlan_rtm_dump(struct sk_buff *skb, struct netlink_callback *cb) goto out_err; } err =br_vlan_dump_dev (dev, skb, cb, dump_flags); -if (err && err != -EMSGSIZE ) +/* if the dump completed without an error we return 0 here */ +if (err != -EMSGSIZE ) goto out_err; }else {for_each_netdev_rcu (net, dev) {
LGTM, thank you.
PATCH 1/1 net: bridge: vlan: fix single net device option dumping
When dumping vlan options for a single net device we send the same entries infinitely because user-space expects a 0 return at the end but we keep returning skb->len and restarting the dump on retry. Fix it by returning the value from br_vlan_dump_dev() if it completed or there was an error. The only case that must return skb->len is when the dump was incomplete and needs to continue (-EMSGSIZE).
--- net/bridge/br_vlan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/bridge/br_vlan.c +2 -1
@@ -2020,7 +2020,8 @@ static int br_vlan_rtm_dump(struct sk_buff *skb, struct netlink_callback *cb) goto out_err; } err =br_vlan_dump_dev (dev, skb, cb, dump_flags); -if (err && err != -EMSGSIZE ) +/* if the dump completed without an error we return 0 here */ +if (err != -EMSGSIZE ) goto out_err; }else {for_each_netdev_rcu (net, dev) {
Signature · 1 line
2.34.1
Re: [PATCH net] net: bridge: vlan: fix single net device option dumping
This patch was applied to netdev/net.git (master) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by David S. Miller <[email protected]>:
Quoted 8 lines · On Wed, 26 Jan 2022 15:10:25 +0200 you wrote:
When dumping vlan options for a single net device we send the same entries infinitely because user-space expects a 0 return at the end but we keep returning
skb->lenand restarting the dump on retry. Fix it by returning the value frombr_vlan_dump_dev()if it completed or there was an error. The only case that must returnskb->lenis when the dump was incomplete and needs to continue (-EMSGSIZE).[...]
Here is the summary with links:
- [net] net: bridge: vlan: fix single net device option dumping
https://git.kernel.org/netdev/net/c/dcb2c5c6ca9b
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html