* [PATCH V3] Fix NULL dereference in super_by_fd
@ 2022-12-20 11:27 lixiaokeng
2022-12-21 8:18 ` Mariusz Tkaczyk
2022-12-21 9:03 ` Paul Menzel
0 siblings, 2 replies; 4+ messages in thread
From: lixiaokeng @ 2022-12-20 11:27 UTC (permalink / raw)
To: Jes Sorensen, Mariusz Tkaczyk, Paul Menzel, linux-raid
Cc: linfeilong, liuzhiqiang (I), Wu Guanghao
When we create 100 partitions (major is 259 not 254) in a raid device,
mdadm may coredump:
Core was generated by `/usr/sbin/mdadm --detail --export /dev/md1p7'.
Program terminated with signal SIGSEGV, Segmentation fault.
#0 __strlen_avx2_rtm () at ../sysdeps/x86_64/multiarch/strlen-avx2.S:74
74 VPCMPEQ (%rdi), %ymm0, %ymm1
(gdb) bt
#0 __strlen_avx2_rtm () at ../sysdeps/x86_64/multiarch/strlen-avx2.S:74
#1 0x00007fbb9a7e4139 in __strcpy_chk (dest=dest@entry=0x55d55d6a13ac "", src=0x0, destlen=destlen@entry=32) at strcpy_chk.c:28
#2 0x000055d55ba1766d in strcpy (__src=<optimized out>, __dest=0x55d55d6a13ac "") at /usr/include/bits/string_fortified.h:79
#3 super_by_fd (fd=fd@entry=3, subarrayp=subarrayp@entry=0x7fff44dfcc48) at util.c:1289
#4 0x000055d55ba273a6 in Detail (dev=0x7fff44dfef0b "/dev/md1p7", c=0x7fff44dfe440) at Detail.c:101
#5 0x000055d55ba0de61 in misc_list (c=<optimized out>, ss=<optimized out>, dump_directory=<optimized out>, ident=<optimized out>, devlist=<optimized out>) at mdadm.c:1959
#6 main (argc=<optimized out>, argv=<optimized out>) at mdadm.c:1629
The direct cause is fd2devnm returning NULL, so add a check.
V1->V2: When fd2devnm return NULL, super_by_fd return NULL but not an
incomplete 'st' entry. At the same time, add a check in map_by_devnm
to avoid coredump.
V2->V3: Fix style issues.
V3->V4: Change strcpy() to strncpy().
Signed-off-by: Li Xiao Keng <lixiaokeng@huawei.com>
Signed-off-by: Wu Guang Hao <wuguanghao3@huawei.com>
---
mapfile.c | 4 ++++
util.c | 7 ++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/mapfile.c b/mapfile.c
index 8d7acb3..f72fe0d 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 64dd409..3a84ee3 100644
--- a/util.c
+++ b/util.c
@@ -1241,6 +1241,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);
@@ -1286,7 +1291,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);
} else
free(subarray);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH V3] Fix NULL dereference in super_by_fd
2022-12-20 11:27 [PATCH V3] Fix NULL dereference in super_by_fd lixiaokeng
@ 2022-12-21 8:18 ` Mariusz Tkaczyk
2022-12-21 9:03 ` Paul Menzel
1 sibling, 0 replies; 4+ messages in thread
From: Mariusz Tkaczyk @ 2022-12-21 8:18 UTC (permalink / raw)
To: lixiaokeng
Cc: Jes Sorensen, Paul Menzel, linux-raid, linfeilong,
liuzhiqiang (I), Wu Guanghao
> *subarrayp = subarray;
> strcpy(st->container_devnm, container);
> - strcpy(st->devnm, fd2devnm(fd));
> + strncpy(st->devnm, devnm, MD_NAME_MAX);
Sorry for bothering you again but there is one nit. Strncpy implementation
doesn't guarantee '\0' ended string- static code analysis may warn. In this
case you can use:
strncpy(st->devnm, devnm, MD_NAME_MAX - 1);
or
snprintf(st->devnm, MD_NAME_MAX, "%s", devnm);
Thanks,
Mariusz
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH V3] Fix NULL dereference in super_by_fd
2022-12-20 11:27 [PATCH V3] Fix NULL dereference in super_by_fd lixiaokeng
2022-12-21 8:18 ` Mariusz Tkaczyk
@ 2022-12-21 9:03 ` Paul Menzel
1 sibling, 0 replies; 4+ messages in thread
From: Paul Menzel @ 2022-12-21 9:03 UTC (permalink / raw)
To: Li Xiao Keng
Cc: Jes Sorensen, Mariusz Tkaczyk, linux-raid, linfeilong,
liuzhiqiang26, Wu Guang Hao
Dear Li,
Thank you for the third iteration.
Am 20.12.22 um 12:27 schrieb lixiaokeng:
[…]
> Signed-off-by: Li Xiao Keng <lixiaokeng@huawei.com>
> Signed-off-by: Wu Guang Hao <wuguanghao3@huawei.com>
The From field of your email still contains lixiaokeng. It looks like
you are using Mozilla Thunderbird. You can configure that in the
accounts settings. Otherwise, using `git send-email` should work in the
future.
Kind regards,
Paul
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH V3] Fix NULL dereference in super_by_fd
@ 2022-12-19 12:22 lixiaokeng
0 siblings, 0 replies; 4+ messages in thread
From: lixiaokeng @ 2022-12-19 12:22 UTC (permalink / raw)
To: Jes Sorensen, mariusz.tkaczyk, Paul Menzel, linux-raid
Cc: linfeilong, liuzhiqiang (I), Wu Guanghao
When we create 100 partitions (major is 259 not 254) in a raid device,
mdadm may coredump:
Core was generated by `/usr/sbin/mdadm --detail --export /dev/md1p7'.
Program terminated with signal SIGSEGV, Segmentation fault.
#0 __strlen_avx2_rtm () at ../sysdeps/x86_64/multiarch/strlen-avx2.S:74
74 VPCMPEQ (%rdi), %ymm0, %ymm1
(gdb) bt
#0 __strlen_avx2_rtm () at ../sysdeps/x86_64/multiarch/strlen-avx2.S:74
#1 0x00007fbb9a7e4139 in __strcpy_chk (dest=dest@entry=0x55d55d6a13ac "", src=0x0, destlen=destlen@entry=32) at strcpy_chk.c:28
#2 0x000055d55ba1766d in strcpy (__src=<optimized out>, __dest=0x55d55d6a13ac "") at /usr/include/bits/string_fortified.h:79
#3 super_by_fd (fd=fd@entry=3, subarrayp=subarrayp@entry=0x7fff44dfcc48) at util.c:1289
#4 0x000055d55ba273a6 in Detail (dev=0x7fff44dfef0b "/dev/md1p7", c=0x7fff44dfe440) at Detail.c:101
#5 0x000055d55ba0de61 in misc_list (c=<optimized out>, ss=<optimized out>, dump_directory=<optimized out>, ident=<optimized out>, devlist=<optimized out>) at mdadm.c:1959
#6 main (argc=<optimized out>, argv=<optimized out>) at mdadm.c:1629
The direct cause is fd2devnm returning NULL, so add a check.
V1->V2: When fd2devnm return NULL, super_by_fd return NULL but not an
incomplete 'st' entry. At the same time, add a check in map_by_devnm
to avoid coredump.
V2->V3: Fix style issues.
Signed-off-by: Li Xiao Keng <lixiaokeng@huawei.com>
Signed-off-by: Wu Guang Hao <wuguanghao3@huawei.com>
---
mapfile.c | 4 ++++
util.c | 7 ++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/mapfile.c b/mapfile.c
index 8d7acb3..f72fe0d 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 64dd409..3a84ee3 100644
--- a/util.c
+++ b/util.c
@@ -1241,6 +1241,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);
@@ -1286,7 +1291,7 @@ struct supertype *super_by_fd(int fd, char **subarrayp)
if (subarrayp)
*subarrayp = subarray;
strcpy(st->container_devnm, container);
- strcpy(st->devnm, fd2devnm(fd));
+ strcpy(st->devnm, devnm);
} else
free(subarray);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-12-21 9:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-20 11:27 [PATCH V3] Fix NULL dereference in super_by_fd lixiaokeng
2022-12-21 8:18 ` Mariusz Tkaczyk
2022-12-21 9:03 ` Paul Menzel
-- strict thread matches above, loose matches on Subject: below --
2022-12-19 12:22 lixiaokeng
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.