This is a note to let you know that I've just added the patch titled
net: vlan: fix nlmsg size calculation in vlan_get_size()
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-vlan-fix-nlmsg-size-calculation-in-vlan_get_size.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From ac784a91c26bf53af7db09d8d6c0d1c24d714d65 Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <[email protected]>
Date: Mon, 7 Oct 2013 23:19:58 +0200
Subject: net: vlan: fix nlmsg size calculation in vlan_get_size()
From: Marc Kleine-Budde <[email protected]>
[ Upstream commit c33a39c575068c2ea9bffb22fd6de2df19c74b89 ]
This patch fixes the calculation of the nlmsg size, by adding the missing
nla_total_size().
Cc: Patrick McHardy <[email protected]>
Signed-off-by: Marc Kleine-Budde <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
net/8021q/vlan_netlink.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/net/8021q/vlan_netlink.c
+++ b/net/8021q/vlan_netlink.c
@@ -171,7 +171,7 @@ static size_t vlan_get_size(const struct
return nla_total_size(2) + /* IFLA_VLAN_PROTOCOL */
nla_total_size(2) + /* IFLA_VLAN_ID */
- sizeof(struct ifla_vlan_flags) + /* IFLA_VLAN_FLAGS */
+ nla_total_size(sizeof(struct ifla_vlan_flags)) + /*
IFLA_VLAN_FLAGS */
vlan_qos_map_size(vlan->nr_ingress_mappings) +
vlan_qos_map_size(vlan->nr_egress_mappings);
}
Patches currently in stable-queue which might be from [email protected] are
queue-3.10/net-vlan-fix-nlmsg-size-calculation-in-vlan_get_size.patch
queue-3.10/can-dev-fix-nlmsg-size-calculation-in-can_get_size.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
