From: Jon Maloy <jon.maloy@ericsson.com>
Date: Wed, 15 Nov 2017 16:25:44 +0000 (+0100)
Subject: tipc: change family attribute from u32 to u16
X-Git-Tag: v4.16.0~134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aab3661bd2a17f60ec45322c5f83c40a857ff1b2;p=thirdparty%2Fiproute2.git

tipc: change family attribute from u32 to u16

commit 28033ae4e0f ("net: netlink: Update attr validation to require
exact length for some types") introduces a stricter control on attributes
of type NLA_U* and NLA_S*.

Since the tipc tool is sending a family attribute of u32 instead of as
expected u16 the tool is now effectively broken.

We fix this by changing the type of the said attribute.

Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
---

diff --git a/tipc/msg.c b/tipc/msg.c
index 22c22226b..dc09d0504 100644
--- a/tipc/msg.c
+++ b/tipc/msg.c
@@ -125,7 +125,7 @@ static int get_family(void)
 	genl->cmd = CTRL_CMD_GETFAMILY;
 	genl->version = 1;
 
-	mnl_attr_put_u32(nlh, CTRL_ATTR_FAMILY_ID, GENL_ID_CTRL);
+	mnl_attr_put_u16(nlh, CTRL_ATTR_FAMILY_ID, GENL_ID_CTRL);
 	mnl_attr_put_strz(nlh, CTRL_ATTR_FAMILY_NAME, TIPC_GENL_V2_NAME);
 
 	if ((err = msg_query(nlh, family_id_cb, &nl_family)))