summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJes Sorensen <jsorensen@fb.com>2018-05-31 13:38:08 -0400
committerJes Sorensen <jsorensen@fb.com>2018-05-31 13:49:46 -0400
commit4d061b02b61d5e6d4186e0118166fdd40ea8b55f (patch)
tree15859f87f355c8ec609f600f24892d714c3d3e84
parent2dcd6492718c2921feac993aa71ed3a7c2522077 (diff)
downloadmdadm-4d061b02b61d5e6d4186e0118166fdd40ea8b55f.tar.gz
super1: Fix cases triggering gcc-8.1 strncpy truncate warning
Find the string length, copy it, and zero out the rest, instead of relying on strncpy cleaning up for us. Signed-off-by: Jes Sorensen <jsorensen@fb.com>
-rw-r--r--super1.c22
1 files changed, 18 insertions, 4 deletions
diff --git a/super1.c b/super1.c
index 6774fbd..636a286 100644
--- a/super1.c
+++ b/super1.c
@@ -1434,8 +1434,15 @@ static int update_super1(struct supertype *st, struct mdinfo *info,
strcpy(sb->set_name, homehost);
strcat(sb->set_name, ":");
strcat(sb->set_name, info->name);
- } else
- strncpy(sb->set_name, info->name, sizeof(sb->set_name));
+ } else {
+ int namelen;
+
+ namelen = min((int)strlen(info->name),
+ (int)sizeof(sb->set_name) - 1);
+ memcpy(sb->set_name, info->name, namelen);
+ memset(&sb->set_name[namelen], '\0',
+ sizeof(sb->set_name) - namelen);
+ }
} else if (strcmp(update, "devicesize") == 0 &&
__le64_to_cpu(sb->super_offset) <
__le64_to_cpu(sb->data_offset)) {
@@ -1592,8 +1599,15 @@ static int init_super1(struct supertype *st, mdu_array_info_t *info,
strcpy(sb->set_name, homehost);
strcat(sb->set_name, ":");
strcat(sb->set_name, name);
- } else
- strncpy(sb->set_name, name, sizeof(sb->set_name));
+ } else {
+ int namelen;
+
+ namelen = min((int)strlen(name),
+ (int)sizeof(sb->set_name) - 1);
+ memcpy(sb->set_name, name, namelen);
+ memset(&sb->set_name[namelen], '\0',
+ sizeof(sb->set_name) - namelen);
+ }
sb->ctime = __cpu_to_le64((unsigned long long)time(0));
sb->level = __cpu_to_le32(info->level);