From 313ce6949c0d08a9a04a891ab6d94d0916217c66 Mon Sep 17 00:00:00 2001 From: Hoang Le Date: Fri, 8 Jun 2018 09:19:28 +0700 Subject: [PATCH] tipc: TIPC_NLA_LINK_NAME value pass on nesting entry TIPC_NLA_LINK In the commit 94f6a80 on next-net, TIPC_NLA_LINK_NAME attribute should be retrieved and validated via TIPC_NLA_LINK nesting entry in tipc_nl_node_get_link(). According to that commit, TIPC_NLA_LINK_NAME value passing via tipc link get command must follow above hierachy. Acked-by: Ying Xue Signed-off-by: Hoang Le Acked-by: Jon Maloy Signed-off-by: Stephen Hemminger --- tipc/link.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tipc/link.c b/tipc/link.c index 02f14aade..a2d7c0016 100644 --- a/tipc/link.c +++ b/tipc/link.c @@ -97,6 +97,7 @@ static int cmd_link_get_prop(struct nlmsghdr *nlh, const struct cmd *cmd, { int prop; char buf[MNL_SOCKET_BUFFER_SIZE]; + struct nlattr *attrs; struct opt *opt; struct opt opts[] = { { "link", OPT_KEYVAL, NULL }, @@ -131,7 +132,9 @@ static int cmd_link_get_prop(struct nlmsghdr *nlh, const struct cmd *cmd, fprintf(stderr, "error, missing link\n"); return -EINVAL; } + attrs = mnl_attr_nest_start(nlh, TIPC_NLA_LINK); mnl_attr_put_strz(nlh, TIPC_NLA_LINK_NAME, opt->val); + mnl_attr_nest_end(nlh, attrs); return msg_doit(nlh, link_get_cb, &prop); } -- 2.47.2