diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-04-07 16:50:41 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-04-07 16:50:41 +0800 |
| commit | 11cbb42a86895b88ac906a6768c998f9e98a37e2 (patch) | |
| tree | 3eaeec2cff4c7e34add793c77079cdc85b058bb8 /net/tipc/netlink_compat.c | |
| parent | 95ffb43f1ba759fb1205a8ce38a7ea5bab6be02d (diff) | |
| parent | 95bcc3e563748f65c9fc0eb1bbc3f99b76efd4b2 (diff) | |
Merge remote-tracking branch 'origin/v4.4/topic/hibernate' into hikey-mainline-rebase-4.4hikey-hibernate-v4.4
Conflicts:
arch/arm64/Makefile
arch/arm64/kernel/arm64ksyms.c
arch/arm64/kernel/asm-offsets.c
arch/arm64/kvm/hyp/fpsimd.S
drivers/firmware/psci.c
fs/proc/task_mmu.c
mm/memcontrol.c
Diffstat (limited to 'net/tipc/netlink_compat.c')
| -rw-r--r-- | net/tipc/netlink_compat.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c index 1eadc95e1132..a0c90572d0e5 100644 --- 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"); |