]> git.baikalelectronics.ru Git - kernel.git/commitdiff
block: fix an error code in add_partition()
authorDan Carpenter <dan.carpenter@oracle.com>
Tue, 23 May 2017 14:28:36 +0000 (17:28 +0300)
committerJens Axboe <axboe@fb.com>
Tue, 23 May 2017 14:41:59 +0000 (08:41 -0600)
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: 1c2de0cedfd2 ("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>
block/partition-generic.c

index ff07b9143ca456f8b2e8aaa3f41f9d6d8b5fe7a3..c5ec8246e25e1ed3eb6aef683c99e4aacd32ce2c 100644 (file)
@@ -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;
        }