colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform/vlan: fix incorrect type for ingress/egress qos mappings

Browse Source 
The kernel was updated to add stricter validation to netlink messages,
which revealed this bug:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=6c21660fe221a15c789dee2bc2fd95516bc5aeaf

Fixes: a5ea141956 ('platform/vlan: add support for ingress/egress-qos-mappings and changing flags')
This commit is contained in:
Jan Vaclav
2025-01-14 12:20:18 +01:00
parent 9ed9037465
commit 84bcc0eab9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libnm-platform/nm-linux-platform.c
View File

@@ -5483,7 +5483,7 @@ _nl_msg_new_link_set_linkinfo_vlan(struct nl_msg *msg,
if (!(qos = nla_nest_start(msg, IFLA_VLAN_INGRESS_QOS)))
goto nla_put_failure;
}
NLA_PUT(msg, i, sizeof(ingress_qos[i]), &ingress_qos[i]);
NLA_PUT(msg, IFLA_VLAN_QOS_MAPPING, sizeof(ingress_qos[i]), &ingress_qos[i]);
}
}
@@ -5500,7 +5500,7 @@ _nl_msg_new_link_set_linkinfo_vlan(struct nl_msg *msg,
if (!(qos = nla_nest_start(msg, IFLA_VLAN_EGRESS_QOS)))
goto nla_put_failure;
}
NLA_PUT(msg, i, sizeof(egress_qos[i]), &egress_qos[i]);
NLA_PUT(msg, IFLA_VLAN_QOS_MAPPING, sizeof(egress_qos[i]), &egress_qos[i]);
}
}