lkml.org 
[lkml]   [2020]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 002/131] block/bio-integrity: don't free 'buf' if bio_integrity_add_page() failed
    Date
    From: yu kuai <yukuai3@huawei.com>

    commit a75ca9303175d36af93c0937dd9b1a6422908b8d upstream.

    commit e7bf90e5afe3 ("block/bio-integrity: fix a memory leak bug") added
    a kfree() for 'buf' if bio_integrity_add_page() returns '0'. However,
    the object will be freed in bio_integrity_free() since 'bio->bi_opf' and
    'bio->bi_integrity' were set previousy in bio_integrity_alloc().

    Fixes: commit e7bf90e5afe3 ("block/bio-integrity: fix a memory leak bug")
    Signed-off-by: yu kuai <yukuai3@huawei.com>
    Reviewed-by: Ming Lei <ming.lei@redhat.com>
    Reviewed-by: Bob Liu <bob.liu@oracle.com>
    Acked-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Cc: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    block/bio-integrity.c | 1 -
    1 file changed, 1 deletion(-)

    diff --git a/block/bio-integrity.c b/block/bio-integrity.c
    index 5bd90cd4b51e3..a059fad53f1b0 100644
    --- a/block/bio-integrity.c
    +++ b/block/bio-integrity.c
    @@ -293,7 +293,6 @@ bool bio_integrity_prep(struct bio *bio)

    if (ret == 0) {
    printk(KERN_ERR "could not attach integrity payload\n");
    - kfree(buf);
    status = BLK_STS_RESOURCE;
    goto err_end_io;
    }
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-29 21:37    [W:2.800 / U:1.520 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site