diff options
| author | Sergey Vidishev <sergeyv@yandex-team.ru> | 2015-05-19 22:02:46 +0300 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2015-05-20 13:16:09 +1000 |
| commit | 1e08717f0b7856b389e9d5eb2dc330d146636183 (patch) | |
| tree | f4be1e035a44766901794746aa56dbe1b008831e | |
| parent | dd0468af57ed8b9637c39cd72478f9d5d2c4ec27 (diff) | |
| download | mdadm-1e08717f0b7856b389e9d5eb2dc330d146636183.tar.gz | |
mdadm: monitor: fix nullptr dereference when get_md_name() returns NULL
Function add_new_arrays() expects that function get_md_name() should
return pointer to devname, but also get_md_name() may return NULL. So
check the pointer before use it in add_new_arrays().
Signed-off-by: Sergey Vidishev <sergeyv@yandex-team.ru>
Signed-off-by: NeilBrown <neilb@suse.de>
| -rw-r--r-- | Monitor.c | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -687,6 +687,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] && @@ -697,7 +698,14 @@ 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) { + free(st); + continue; + } + + st->devname = xstrdup(name); if ((fd = open(st->devname, O_RDONLY)) < 0 || ioctl(fd, GET_ARRAY_INFO, &array)< 0) { /* no such array */ |