Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / net / tipc / node.c

diff --git a/net/tipc/node.c b/net/tipc/node.c
index 20d98c56e152685a5ab84e584e9a31a33cb1bfec..2c24e7d6d9506a38a0072c2517da793ed57b81ba 100644 (file)
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -703,7 +703,7 @@ struct sk_buff *tipc_node_get_links(const void *req_tlv_area, int req_tlv_space)
 
        link_info.dest = htonl(tipc_own_addr & 0xfffff00);
        link_info.up = htonl(1);
-       sprintf(link_info.str, tipc_bclink_name);
+       strlcpy(link_info.str, tipc_bclink_name, TIPC_MAX_LINK_NAME);
        tipc_cfg_append_tlv(buf, TIPC_TLV_LINK_INFO, &link_info, sizeof(link_info));
 
        /* Add TLVs for any other links in scope */