summaryrefslogtreecommitdiffstats
path: root/block/partition-generic.c
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2017-05-23 17:28:36 +0300
committerJens Axboe <axboe@fb.com>2017-05-23 08:41:59 -0600
commit7bd897cfce1eb373892d35d7f73201b0f9b221c4 (patch)
tree8091261d734c80016cdcaa86e07aee84d8c09556 /block/partition-generic.c
parentb4f428ef2844e9fa8154f2faaca249aa74e222a7 (diff)
downloadlinux-stable-7bd897cfce1eb373892d35d7f73201b0f9b221c4.tar.gz
linux-stable-7bd897cfce1eb373892d35d7f73201b0f9b221c4.tar.bz2
linux-stable-7bd897cfce1eb373892d35d7f73201b0f9b221c4.zip
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>
Diffstat (limited to 'block/partition-generic.c')
-rw-r--r--block/partition-generic.c4
1 files changed, 3 insertions, 1 deletions
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;
}