summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormajianpeng <majianpeng@gmail.com>2012-04-02 09:48:37 +1000
committerNeilBrown <neilb@suse.de>2012-04-02 09:48:37 +1000
commit98d5561bfbc3c7a53d6abc1812a2bd5344d36fa3 (patch)
tree6397046f8dc7a82986ebd7e442491dc118d1a850
parentdd775ae2549217d3ae09363e3edb305d0fa19928 (diff)
downloadop-kernel-dev-98d5561bfbc3c7a53d6abc1812a2bd5344d36fa3.zip
op-kernel-dev-98d5561bfbc3c7a53d6abc1812a2bd5344d36fa3.tar.gz
md/linear: If md_integrity_register() fails, linear_run() must free the mem.
Signed-off-by: majianpeng <majianpeng@gmail.com> Signed-off-by: NeilBrown <neilb@suse.de>
-rw-r--r--drivers/md/linear.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index b0fcc7d..fa211d8 100644
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -198,6 +198,7 @@ out:
static int linear_run (struct mddev *mddev)
{
struct linear_conf *conf;
+ int ret;
if (md_check_no_bitmap(mddev))
return -EINVAL;
@@ -211,7 +212,13 @@ static int linear_run (struct mddev *mddev)
blk_queue_merge_bvec(mddev->queue, linear_mergeable_bvec);
mddev->queue->backing_dev_info.congested_fn = linear_congested;
mddev->queue->backing_dev_info.congested_data = mddev;
- return md_integrity_register(mddev);
+
+ ret = md_integrity_register(mddev);
+ if (ret) {
+ kfree(conf);
+ mddev->private = NULL;
+ }
+ return ret;
}
static int linear_add(struct mddev *mddev, struct md_rdev *rdev)
OpenPOWER on IntegriCloud