ARM64: DTS: Add rk3399-firefly uart4 device, node as /dev/ttyS1

[firefly-linux-kernel-4.4.55.git] / net / tipc / netlink_compat.c

diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c
index 1eadc95e113294c159a6e5288db831e142be77dc..a0c90572d0e57900e969f94aba4767305a16ec96 100644 (file)
--- a/net/tipc/netlink_compat.c
+++ b/net/tipc/netlink_compat.c
@@ -574,7 +574,8 @@ static int tipc_nl_compat_link_dump(struct tipc_nl_compat_msg *msg,
 
        link_info.dest = nla_get_flag(link[TIPC_NLA_LINK_DEST]);
        link_info.up = htonl(nla_get_flag(link[TIPC_NLA_LINK_UP]));
-       strcpy(link_info.str, nla_data(link[TIPC_NLA_LINK_NAME]));
+       nla_strlcpy(link_info.str, link[TIPC_NLA_LINK_NAME],
+                   TIPC_MAX_LINK_NAME);
 
        return tipc_add_tlv(msg->rep, TIPC_TLV_LINK_INFO,
                            &link_info, sizeof(link_info));
@@ -802,7 +803,7 @@ static int tipc_nl_compat_name_table_dump(struct tipc_nl_compat_msg *msg,
                goto out;
 
        tipc_tlv_sprintf(msg->rep, "%-10u %s",
-                        nla_get_u32(publ[TIPC_NLA_PUBL_REF]),
+                        nla_get_u32(publ[TIPC_NLA_PUBL_KEY]),
                         scope_str[nla_get_u32(publ[TIPC_NLA_PUBL_SCOPE])]);
 out:
        tipc_tlv_sprintf(msg->rep, "\n");