diff options
| author | Yufen Yu <yuyufen@huawei.com> | 2019-04-02 09:22:14 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-25 19:16:24 +0300 |
| commit | ad58eb2c5cba97ddf50471c9b6d5d48e80dd0f7a (patch) | |
| tree | e97d6d0e146b2619ef63f87080f86cb7e16eabd1 /drivers/md | |
| parent | ae586c606aeebd9bbfab181b08c55daede4c0500 (diff) | |
| download | linux-ad58eb2c5cba97ddf50471c9b6d5d48e80dd0f7a.tar.xz | |
md: add mddev->pers to avoid potential NULL pointer dereference
commit ee37e62191a59d253fc916b9fc763deb777211e2 upstream.
When doing re-add, we need to ensure rdev->mddev->pers is not NULL,
which can avoid potential NULL pointer derefence in fallowing
add_bound_rdev().
Fixes: a6da4ef85cef ("md: re-add a failed disk")
Cc: Xiao Ni <xni@redhat.com>
Cc: NeilBrown <neilb@suse.com>
Cc: <stable@vger.kernel.org> # 4.4+
Reviewed-by: NeilBrown <neilb@suse.com>
Signed-off-by: Yufen Yu <yuyufen@huawei.com>
Signed-off-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/md.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index d0f688399a56..6a98e882382c 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -2852,8 +2852,10 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len) err = 0; } } else if (cmd_match(buf, "re-add")) { - if (test_bit(Faulty, &rdev->flags) && (rdev->raid_disk == -1) && - rdev->saved_raid_disk >= 0) { + if (!rdev->mddev->pers) + err = -EINVAL; + else if (test_bit(Faulty, &rdev->flags) && (rdev->raid_disk == -1) && + rdev->saved_raid_disk >= 0) { /* clear_bit is performed _after_ all the devices * have their local Faulty bit cleared. If any writes * happen in the meantime in the local node, they |