diff options
| author | James Morris <jmorris@namei.org> | 2009-03-28 14:57:13 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-28 14:57:13 +1100 |
| commit | bb798169d1bb860b07192cf9c75937fadc8610b4 (patch) | |
| tree | fa67f14406a1e79897e6f29e59fed7c02ec31c30 /net/tipc/bcast.c | |
| parent | a106cbfd1f3703402fc2d95d97e7a054102250f0 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
| download | kernel-crypto-bb798169d1bb860b07192cf9c75937fadc8610b4.tar.gz kernel-crypto-bb798169d1bb860b07192cf9c75937fadc8610b4.tar.xz kernel-crypto-bb798169d1bb860b07192cf9c75937fadc8610b4.zip | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
Diffstat (limited to 'net/tipc/bcast.c')
| -rw-r--r-- | net/tipc/bcast.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c index 3ddaff42d1b..a3bfd406491 100644 --- a/net/tipc/bcast.c +++ b/net/tipc/bcast.c @@ -119,7 +119,7 @@ static struct bclink *bclink = NULL; static struct link *bcl = NULL; static DEFINE_SPINLOCK(bc_lock); -char tipc_bclink_name[] = "multicast-link"; +const char tipc_bclink_name[] = "multicast-link"; static u32 buf_seqno(struct sk_buff *buf) @@ -800,7 +800,7 @@ int tipc_bclink_init(void) tipc_link_set_queue_limits(bcl, BCLINK_WIN_DEFAULT); bcl->b_ptr = &bcbearer->bearer; bcl->state = WORKING_WORKING; - sprintf(bcl->name, tipc_bclink_name); + strlcpy(bcl->name, tipc_bclink_name, TIPC_MAX_LINK_NAME); if (BCLINK_LOG_BUF_SIZE) { char *pb = kmalloc(BCLINK_LOG_BUF_SIZE, GFP_ATOMIC); |