From: Sergey Vidishev <sergeyv@yandex-team.ru>
To: NeilBrown <neilb@suse.de>
Cc: linux-raid@vger.kernel.org, sergeyv@yandex-team.ru
Subject: [PATCH] monitor: fix nullptr dereference when get_md_name() returns NULL
Date: Fri, 10 Oct 2014 17:23:18 +0400 [thread overview]
Message-ID: <1531453.K804EMet0W@sergeyv_box> (raw)
From f35857936a8df2155b9aee3759c91fc19b77842c Mon Sep 17 00:00:00 2001
From: Sergey Vidishev <sergeyv@yandex-team.ru>
Date: Wed, 8 Oct 2014 21:51:03 +0400
Subject: [PATCH] monitor: fix nullptr dereference when get_md_name() returns NULL
Signed-off-by: Sergey Vidishev <sergeyv@yandex-team.ru>
---
This patch against fresh git://neil.brown.name/mdadm.
I'm not subscribed to the list, please CC me in replies.
Monitor.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/Monitor.c b/Monitor.c
index 5cb24fa..1919f99 100644
--- a/Monitor.c
+++ b/Monitor.c
@@ -668,6 +668,7 @@ static int add_new_arrays(struct mdstat_ent *mdstat, struct state **statelist,
{
struct mdstat_ent *mse;
int new_found = 0;
+ char *name;
for (mse=mdstat; mse; mse=mse->next)
if (mse->devnm[0] &&
@@ -678,7 +679,12 @@ static int add_new_arrays(struct mdstat_ent *mdstat, struct state **statelist,
struct state *st = xcalloc(1, sizeof *st);
mdu_array_info_t array;
int fd;
- st->devname = xstrdup(get_md_name(mse->devnm));
+
+ name = get_md_name(mse->devnm);
+ if (!name)
+ return 0;
+
+ st->devname = xstrdup(name);
if ((fd = open(st->devname, O_RDONLY)) < 0 ||
ioctl(fd, GET_ARRAY_INFO, &array)< 0) {
/* no such array */
--
1.9.1
next reply other threads:[~2014-10-10 13:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-10 13:23 Sergey Vidishev [this message]
2015-05-18 23:33 ` [PATCH v2] mdadm: monitor: fix nullptr dereference when get_md_name() returns NULL Sergey Vidishev
2015-05-19 1:42 ` David F.
2015-05-19 18:39 ` Sergey Vidishev
2015-05-19 19:02 ` [PATCH v3] " Sergey Vidishev
2015-05-20 3:16 ` NeilBrown
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=1531453.K804EMet0W@sergeyv_box \
--to=sergeyv@yandex-team.ru \
--cc=linux-raid@vger.kernel.org \
--cc=neilb@suse.de \
/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;
as well as URLs for NNTP newsgroup(s).