From: lixiaokeng <lixiaokeng@huawei.com>
To: <jes@trained-monkey.org>, <linux-raid@vger.kernel.org>
Cc: linfeilong <linfeilong@huawei.com>,
"liuzhiqiang (I)" <liuzhiqiang26@huawei.com>,
Wu Guanghao <wuguanghao3@huawei.com>
Subject: [PATCH] Fix NULL difference in super_by_fd
Date: Mon, 12 Dec 2022 17:23:46 +0800 [thread overview]
Message-ID: <4dc03371-2b6f-a606-6e57-13fb774daa2d@huawei.com> (raw)
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/md1p3'.
Program terminated with signal SIGSEGV, Segmentation fault.
#0 __strlen_sse2 ()
at ../sysdeps/x86_64/multiarch/strlen-vec.S:126
126 movdqu (%rax), %xmm4
(gdb) bt
#0 __strlen_sse2 ()
at ../sysdeps/x86_64/multiarch/strlen-vec.S:126
#1 0x00007f1944659139 in __strcpy_chk (
dest=dest@entry=0x55ea8d7c23ac "", src=0x0,
destlen=destlen@entry=32) at strcpy_chk.c:28
#2 0x000055ea8d10b66d in strcpy (__src=<optimized out>,
__dest=0x55ea8d7c23ac "")
at /usr/include/bits/string_fortified.h:79
#3 super_by_fd (fd=fd@entry=3,
subarrayp=subarrayp@entry=0x7ffe6a1dff08) at util.c:1289
#4 0x000055ea8d11b3a6 in Detail (
dev=0x7ffe6a1e2f22 "/dev/md1p3", c=0x7ffe6a1e1700)
at Detail.c:101
#5 0x000055ea8d101e61 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 return NULL. Here add a check.
Signed-off-by:Lixiaokeng<lixiaokeng@huawei.com>
Signed-off-by:Wuguanghao<wuguanghao3@huawei.com>
---
util.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/util.c b/util.c
index 26ffdcea..843bfc6d 100644
--- a/util.c
+++ b/util.c
@@ -1177,6 +1177,7 @@ struct supertype *super_by_fd(int fd, char **subarrayp)
int i;
char *subarray = NULL;
char container[32] = "";
+ char *devnm = NULL;
sra = sysfs_read(fd, NULL, GET_VERSION);
@@ -1222,7 +1223,10 @@ struct supertype *super_by_fd(int fd, char **subarrayp)
if (subarrayp)
*subarrayp = subarray;
strcpy(st->container_devnm, container);
- strcpy(st->devnm, fd2devnm(fd));
+ if (devnm = fd2devnm(fd))
+ strcpy(st->devnm, devnm);
+ else
+ st->devnm[0] = '\0';
} else
free(subarray);
--
next reply other threads:[~2022-12-12 9:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-12 9:23 lixiaokeng [this message]
2022-12-13 15:30 ` [PATCH] Fix NULL difference in super_by_fd Jes Sorensen
2022-12-14 1:19 ` lixiaokeng
2022-12-14 3:08 ` lixiaokeng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4dc03371-2b6f-a606-6e57-13fb774daa2d@huawei.com \
--to=lixiaokeng@huawei.com \
--cc=jes@trained-monkey.org \
--cc=linfeilong@huawei.com \
--cc=linux-raid@vger.kernel.org \
--cc=liuzhiqiang26@huawei.com \
--cc=wuguanghao3@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox