Re: [iproute2 1/1] tipc: change family attribute from u32 to u16

2017-11-16 Thread Stephen Hemminger
On Wed, 15 Nov 2017 17:25:44 +0100
Jon Maloy  wrote:

> 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 

Applied.

I noticed devlink has the same problem!
devlink/mnlg.c: mnl_attr_put_u32(nlh, CTRL_ATTR_FAMILY_ID, nlg->id);


[iproute2 1/1] tipc: change family attribute from u32 to u16

2017-11-15 Thread Jon Maloy
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 
---
 tipc/msg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tipc/msg.c b/tipc/msg.c
index 22c..dc09d05 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)))
-- 
2.1.4