lkml.org 
[lkml]   [2018]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.4 066/167] block: fix an error code in add_partition()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit 7bd897cfce1eb373892d35d7f73201b0f9b221c4 ]

    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: Sasha Levin <alexander.levin@microsoft.com>
    ---
    block/partition-generic.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/block/partition-generic.c b/block/partition-generic.c
    index 3c062699f28b..29521753fb23 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;
    }
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-19 18:19    [W:2.107 / U:0.300 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site