diff options
| author | Martin Wilck | 2019-04-29 11:48:15 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-05-25 18:23:40 +0200 |
| commit | f9eccf6ca1e01a0d2a76d4cd9ee5da9725c75561 (patch) | |
| tree | 64f015a22628948003da13903ad47980965badd9 /drivers/md | |
| parent | dm integrity: correctly calculate the size of metadata area (diff) | |
| download | kernel-qcow2-linux-f9eccf6ca1e01a0d2a76d4cd9ee5da9725c75561.tar.gz kernel-qcow2-linux-f9eccf6ca1e01a0d2a76d4cd9ee5da9725c75561.tar.xz kernel-qcow2-linux-f9eccf6ca1e01a0d2a76d4cd9ee5da9725c75561.zip | |
dm mpath: always free attached_handler_name in parse_path()
commit 940bc471780b004a5277c1931f52af363c2fc9da upstream.
Commit b592211c33f7 ("dm mpath: fix attached_handler_name leak and
dangling hw_handler_name pointer") fixed a memory leak for the case
where setup_scsi_dh() returns failure. But setup_scsi_dh may return
success and not "use" attached_handler_name if the
retain_attached_hwhandler flag is not set on the map. As setup_scsi_sh
properly "steals" the pointer by nullifying it, freeing it
unconditionally in parse_path() is safe.
Fixes: b592211c33f7 ("dm mpath: fix attached_handler_name leak and dangling hw_handler_name pointer")
Cc: stable@vger.kernel.org
Reported-by: Yufen Yu <yuyufen@huawei.com>
Signed-off-by: Martin Wilck <mwilck@suse.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/dm-mpath.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c index 419362c2d8ac..baa966e2778c 100644 --- a/drivers/md/dm-mpath.c +++ b/drivers/md/dm-mpath.c @@ -892,6 +892,7 @@ static struct pgpath *parse_path(struct dm_arg_set *as, struct path_selector *ps if (attached_handler_name || m->hw_handler_name) { INIT_DELAYED_WORK(&p->activate_path, activate_path_work); r = setup_scsi_dh(p->path.dev->bdev, m, &attached_handler_name, &ti->error); + kfree(attached_handler_name); if (r) { dm_put_device(ti, p->path.dev); goto bad; @@ -906,7 +907,6 @@ static struct pgpath *parse_path(struct dm_arg_set *as, struct path_selector *ps return p; bad: - kfree(attached_handler_name); free_pgpath(p); return ERR_PTR(r); } |