From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 23 May 2017 14:28:36 +0000 (+0300)
Subject: block: fix an error code in add_partition()
X-Git-Tag: MMI-PSA29.97-13-9~5499^2~8
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7bd897cfce1eb373892d35d7f73201b0f9b221c4;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

block: fix an error code in add_partition()

We don't set an error code on this path.  It means that we return NULL
instead of an error pointer and the caller does a NULL dereference.

Fixes: 6d1d8050b4bc ("block, partition: add partition_meta_info to hd_struct")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/block/partition-generic.c b/block/partition-generic.c
index ff07b9143ca4..c5ec8246e25e 100644
--- a/block/partition-generic.c
+++ b/block/partition-generic.c
@@ -320,8 +320,10 @@ struct hd_struct *add_partition(struct gendisk *disk, int partno,
 
 	if (info) {
 		struct partition_meta_info *pinfo = alloc_part_info(disk);
-		if (!pinfo)
+		if (!pinfo) {
+			err = -ENOMEM;
 			goto out_free_stats;
+		}
 		memcpy(pinfo, info, sizeof(*info));
 		p->info = pinfo;
 	}