From 84bcc0eab97b14ae3c9e96cf9e4fe6e967fa79b3 Mon Sep 17 00:00:00 2001 From: Jan Vaclav Date: Tue, 14 Jan 2025 12:20:18 +0100 Subject: [PATCH] platform/vlan: fix incorrect type for ingress/egress qos mappings 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: a5ea141956ee ('platform/vlan: add support for ingress/egress-qos-mappings and changing flags') --- src/libnm-platform/nm-linux-platform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libnm-platform/nm-linux-platform.c b/src/libnm-platform/nm-linux-platform.c index 3510e68a8..24109568c 100644 --- a/src/libnm-platform/nm-linux-platform.c +++ b/src/libnm-platform/nm-linux-platform.c @@ -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]); } }