diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-02-28 18:36:59 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-02-28 18:36:59 +0000 |
commit | 3db5431c29aa3f9129de0e6dc81c81aacddeaa0b (patch) | |
tree | ea76aad059160e45431a70d137c49096fc647c28 | |
parent | Adding upstream version 4.2+20230223. (diff) | |
download | mdadm-3db5431c29aa3f9129de0e6dc81c81aacddeaa0b.tar.xz mdadm-3db5431c29aa3f9129de0e6dc81c81aacddeaa0b.zip |
Adding upstream version 4.2+20230227.upstream/4.2+20230227
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | mapfile.c | 4 | ||||
-rw-r--r-- | util.c | 7 |
2 files changed, 10 insertions, 1 deletions
@@ -292,6 +292,10 @@ struct map_ent *map_by_uuid(struct map_ent **map, int uuid[4]) struct map_ent *map_by_devnm(struct map_ent **map, char *devnm) { struct map_ent *mp; + + if (!devnm) + return NULL; + if (!*map) map_read(map); @@ -1160,6 +1160,11 @@ struct supertype *super_by_fd(int fd, char **subarrayp) int i; char *subarray = NULL; char container[32] = ""; + char *devnm = NULL; + + devnm = fd2devnm(fd); + if (!devnm) + return NULL; sra = sysfs_read(fd, NULL, GET_VERSION); @@ -1205,7 +1210,7 @@ struct supertype *super_by_fd(int fd, char **subarrayp) if (subarrayp) *subarrayp = subarray; strcpy(st->container_devnm, container); - strcpy(st->devnm, fd2devnm(fd)); + strncpy(st->devnm, devnm, MD_NAME_MAX - 1); } else free(subarray); |