diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2017-05-23 17:28:36 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-09-15 18:29:49 +0100 |
| commit | d74706c22cfe345dc1e47473855bee2d713b45d5 (patch) | |
| tree | a100ca556afc5bd6661ac0e37ee8e2c0ada1b33c /block | |
| parent | a03efbf9cdeeb81a8218099a52ccad6e304592d3 (diff) | |
| download | linux-stable-d74706c22cfe345dc1e47473855bee2d713b45d5.tar.gz linux-stable-d74706c22cfe345dc1e47473855bee2d713b45d5.tar.bz2 linux-stable-d74706c22cfe345dc1e47473855bee2d713b45d5.zip | |
block: fix an error code in add_partition()
commit 7bd897cfce1eb373892d35d7f73201b0f9b221c4 upstream.
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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/partition-generic.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/block/partition-generic.c b/block/partition-generic.c index 0d9e5f97f0a8..94de2055365e 100644 --- a/block/partition-generic.c +++ b/block/partition-generic.c @@ -309,8 +309,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; } |