From b7b6710100dbdc235b2eac6e357a54e3e0454feb Mon Sep 17 00:00:00 2001 From: Zhao Hongjiang Date: Thu, 20 Jun 2013 18:59:51 +0800 Subject: [PATCH] --- yaml --- r: 377719 b: refs/heads/master c: ad917e7f821855a2f223131bb6c90ca6c9240bf3 h: refs/heads/master i: 377717: 3a15f5d6d03b2c5ba2dfcfab728bbe8ad0fa323d 377715: 6d02a1573343584418332c534dcc1b4cc9148fce 377711: e97b1c93cfb2c789e861d71a75820af740503697 v: v3 --- [refs] | 2 +- trunk/fs/dlm/config.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 65cc3bd9db44..a931c13a1df9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 06452eb0538827d2158945d20e3d33e359884437 +refs/heads/master: ad917e7f821855a2f223131bb6c90ca6c9240bf3 diff --git a/trunk/fs/dlm/config.c b/trunk/fs/dlm/config.c index 7d58d5b112b5..76feb4b60fa6 100644 --- a/trunk/fs/dlm/config.c +++ b/trunk/fs/dlm/config.c @@ -138,8 +138,9 @@ static ssize_t cluster_cluster_name_read(struct dlm_cluster *cl, char *buf) static ssize_t cluster_cluster_name_write(struct dlm_cluster *cl, const char *buf, size_t len) { - strncpy(dlm_config.ci_cluster_name, buf, DLM_LOCKSPACE_LEN); - strncpy(cl->cl_cluster_name, buf, DLM_LOCKSPACE_LEN); + strlcpy(dlm_config.ci_cluster_name, buf, + sizeof(dlm_config.ci_cluster_name)); + strlcpy(cl->cl_cluster_name, buf, sizeof(cl->cl_cluster_name)); return len; }