diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-06-16 17:26:04 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-06-16 17:26:04 -0700 |
| commit | b526e52dc7cbdde98db9c9f8765be28ba6d71d78 (patch) | |
| tree | c9c303fc940a4da78996d26f829271913fe8b730 /managemon.c | |
| parent | fd547b508c90a647cf60df678047f07046cf5c68 (diff) | |
| download | mdadm-b526e52dc7cbdde98db9c9f8765be28ba6d71d78.tar.gz | |
Always assume SKIP_GONE_DEVS behaviour and kill the flag
...i.e. GET_DEVS == (GET_DEVS|SKIP_GONE_DEVS)
A null pointer dereference in Incremental.c can be triggered by
replugging a disk while the old name is in use. When mdadm -I is called
on the new disk we fail the call to sysfs_read(). I audited all the
locations that use GET_DEVS and it appears they can tolerate missing a
drive. So just make SKIP_GONE_DEVS the default behaviour.
Also fix up remaining unchecked usages of the sysfs_read() return value.
Reported-by: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'managemon.c')
| -rw-r--r-- | managemon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/managemon.c b/managemon.c index 454c39d..debca97 100644 --- a/managemon.c +++ b/managemon.c @@ -315,7 +315,7 @@ static void manage_container(struct mdstat_ent *mdstat, * To see what is removed and what is added. * These need to be remove from, or added to, the array */ - mdi = sysfs_read(-1, mdstat->devnum, GET_DEVS|SKIP_GONE_DEVS); + mdi = sysfs_read(-1, mdstat->devnum, GET_DEVS); if (!mdi) { /* invalidate the current count so we can try again */ container->devcnt = -1; |