lkml.org 
[lkml]   [2014]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 112/129] rbd: fix null dereference in dout
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Josh Durgin <josh.durgin@inktank.com>

    commit c35455791c1131e7ccbf56ea6fbdd562401c2ce2 upstream.

    The order parameter is sometimes NULL in _rbd_dev_v2_snap_size(), but
    the dout() always derefences it. Move this to another dout() protected
    by a check that order is non-NULL.

    Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
    Reviewed-by: Sage Weil <sage@inktank.com>
    Reviewed-by: Alex Elder <alex.elder@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/block/rbd.c | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    --- a/drivers/block/rbd.c
    +++ b/drivers/block/rbd.c
    @@ -3712,12 +3712,14 @@ static int _rbd_dev_v2_snap_size(struct
    if (ret < sizeof (size_buf))
    return -ERANGE;

    - if (order)
    + if (order) {
    *order = size_buf.order;
    + dout(" order %u", (unsigned int)*order);
    + }
    *snap_size = le64_to_cpu(size_buf.size);

    - dout(" snap_id 0x%016llx order = %u, snap_size = %llu\n",
    - (unsigned long long)snap_id, (unsigned int)*order,
    + dout(" snap_id 0x%016llx snap_size = %llu\n",
    + (unsigned long long)snap_id,
    (unsigned long long)*snap_size);

    return 0;



    \
     
     \ /
      Last update: 2014-01-07 01:01    [W:2.250 / U:1.268 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site