Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Jes Sorensen 2018-05-31 13:38:08 -04:00
parent 2dcd649271
commit 4d061b02b6
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
super1.c
View File

@ -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);