diff options
-rw-r--r-- | net/tipc/bcast.c | 4 | ||||
-rw-r--r-- | net/tipc/bcast.h | 2 | ||||
-rw-r--r-- | net/tipc/dbg.c | 2 | ||||
-rw-r--r-- | net/tipc/node.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c index 3ddaff42d1bb..a3bfd4064912 100644 --- a/net/tipc/bcast.c +++ b/net/tipc/bcast.c | |||
@@ -119,7 +119,7 @@ static struct bclink *bclink = NULL; | |||
119 | static struct link *bcl = NULL; | 119 | static struct link *bcl = NULL; |
120 | static DEFINE_SPINLOCK(bc_lock); | 120 | static DEFINE_SPINLOCK(bc_lock); |
121 | 121 | ||
122 | char tipc_bclink_name[] = "multicast-link"; | 122 | const char tipc_bclink_name[] = "multicast-link"; |
123 | 123 | ||
124 | 124 | ||
125 | static u32 buf_seqno(struct sk_buff *buf) | 125 | static u32 buf_seqno(struct sk_buff *buf) |
@@ -800,7 +800,7 @@ int tipc_bclink_init(void) | |||
800 | tipc_link_set_queue_limits(bcl, BCLINK_WIN_DEFAULT); | 800 | tipc_link_set_queue_limits(bcl, BCLINK_WIN_DEFAULT); |
801 | bcl->b_ptr = &bcbearer->bearer; | 801 | bcl->b_ptr = &bcbearer->bearer; |
802 | bcl->state = WORKING_WORKING; | 802 | bcl->state = WORKING_WORKING; |
803 | sprintf(bcl->name, tipc_bclink_name); | 803 | strlcpy(bcl->name, tipc_bclink_name, TIPC_MAX_LINK_NAME); |
804 | 804 | ||
805 | if (BCLINK_LOG_BUF_SIZE) { | 805 | if (BCLINK_LOG_BUF_SIZE) { |
806 | char *pb = kmalloc(BCLINK_LOG_BUF_SIZE, GFP_ATOMIC); | 806 | char *pb = kmalloc(BCLINK_LOG_BUF_SIZE, GFP_ATOMIC); |
diff --git a/net/tipc/bcast.h b/net/tipc/bcast.h index 2f2d731bc1c2..4c1771e95c99 100644 --- a/net/tipc/bcast.h +++ b/net/tipc/bcast.h | |||
@@ -70,7 +70,7 @@ struct port_list { | |||
70 | 70 | ||
71 | struct tipc_node; | 71 | struct tipc_node; |
72 | 72 | ||
73 | extern char tipc_bclink_name[]; | 73 | extern const char tipc_bclink_name[]; |
74 | 74 | ||
75 | 75 | ||
76 | /** | 76 | /** |
diff --git a/net/tipc/dbg.c b/net/tipc/dbg.c index 29ecae851668..1885a7edb0c8 100644 --- a/net/tipc/dbg.c +++ b/net/tipc/dbg.c | |||
@@ -258,7 +258,7 @@ void tipc_printf(struct print_buf *pb, const char *fmt, ...) | |||
258 | } | 258 | } |
259 | 259 | ||
260 | if (pb->echo) | 260 | if (pb->echo) |
261 | printk(print_string); | 261 | printk("%s", print_string); |
262 | 262 | ||
263 | spin_unlock_bh(&print_lock); | 263 | spin_unlock_bh(&print_lock); |
264 | } | 264 | } |
diff --git a/net/tipc/node.c b/net/tipc/node.c index 20d98c56e152..2c24e7d6d950 100644 --- 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) | |||
703 | 703 | ||
704 | link_info.dest = htonl(tipc_own_addr & 0xfffff00); | 704 | link_info.dest = htonl(tipc_own_addr & 0xfffff00); |
705 | link_info.up = htonl(1); | 705 | link_info.up = htonl(1); |
706 | sprintf(link_info.str, tipc_bclink_name); | 706 | strlcpy(link_info.str, tipc_bclink_name, TIPC_MAX_LINK_NAME); |
707 | tipc_cfg_append_tlv(buf, TIPC_TLV_LINK_INFO, &link_info, sizeof(link_info)); | 707 | tipc_cfg_append_tlv(buf, TIPC_TLV_LINK_INFO, &link_info, sizeof(link_info)); |
708 | 708 | ||
709 | /* Add TLVs for any other links in scope */ | 709 | /* Add TLVs for any other links in scope */ |