]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
mdadm: fix a buffer overflow
authorSong Liu <songliubraving@fb.com>
Thu, 8 Sep 2016 18:21:07 +0000 (11:21 -0700)
committerJes Sorensen <Jes.Sorensen@redhat.com>
Mon, 12 Sep 2016 16:51:12 +0000 (12:51 -0400)
struct mdp_superblock_1.set_name is 32B long, but struct mdinfo.name
is 33B long. So we need strncpy instead strcpy to avoid buffer
overflow.

Signed-off-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
super1.c

index f3e40232cf56c1ed42ee178edea5fd4779f0c8ab..9f62d23f4d6fe40f659d29f223e15aa465e7c780 100644 (file)
--- a/super1.c
+++ b/super1.c
@@ -1294,7 +1294,7 @@ static int update_super1(struct supertype *st, struct mdinfo *info,
                        strcat(sb->set_name, ":");
                        strcat(sb->set_name, info->name);
                } else
-                       strcpy(sb->set_name, info->name);
+                       strncpy(sb->set_name, info->name, sizeof(sb->set_name));
        } else if (strcmp(update, "devicesize") == 0 &&
            __le64_to_cpu(sb->super_offset) <
            __le64_to_cpu(sb->data_offset)) {
@@ -1444,7 +1444,7 @@ static int init_super1(struct supertype *st, mdu_array_info_t *info,
                strcat(sb->set_name, ":");
                strcat(sb->set_name, name);
        } else
-               strcpy(sb->set_name, name);
+               strncpy(sb->set_name, name, sizeof(sb->set_name));
 
        sb->ctime = __cpu_to_le64((unsigned long long)time(0));
        sb->level = __cpu_to_le32(info->level);