From eb8347f2f3d99756b609cac8faa703a048b0faa6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 28 Feb 2023 19:37:03 +0100 Subject: Merging upstream version 4.2+20230227. Signed-off-by: Daniel Baumann --- mapfile.c | 4 ++++ util.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/mapfile.c b/mapfile.c index 6b2207d..ac35176 100644 --- a/mapfile.c +++ b/mapfile.c @@ -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); diff --git a/util.c b/util.c index 9cd89fa..8c7f3fd 100644 --- a/util.c +++ b/util.c @@ -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); -- cgit v1.2.3