Coverity: Resource leak: close fd before return

[thirdparty/mdadm.git] / super1.c

diff --git a/super1.c b/super1.c
index 6774fbd2b53f020e8ee53229250710ce2eaa4758..636a286697bc00b12a1382277b15dd2c86f874e0 100644 (file)
--- 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);