lkml.org 
[lkml]   [2021]   [May]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.11 189/329] block/rnbd-clt: Check the return value of the function rtrs_clt_query
    Date
    From: Md Haris Iqbal <haris.iqbal@cloud.ionos.com>

    [ Upstream commit 1056ad829ec43f9b705b507c2093b05e2088b0b7 ]

    In case none of the paths are in connected state, the function
    rtrs_clt_query returns an error. In such a case, error out since the
    values in the rtrs_attrs structure would be garbage.

    Fixes: f7a7a5c228d45 ("block/rnbd: client: main functionality")
    Signed-off-by: Md Haris Iqbal <haris.iqbal@ionos.com>
    Reviewed-by: Guoqing Jiang <guoqing.jiang@ionos.com>
    Signed-off-by: Jack Wang <jinpu.wang@ionos.com>
    Signed-off-by: Gioh Kim <gi-oh.kim@ionos.com>
    Link: https://lore.kernel.org/r/20210428061359.206794-4-gi-oh.kim@ionos.com
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/block/rnbd/rnbd-clt.c | 12 ++++++++++--
    1 file changed, 10 insertions(+), 2 deletions(-)

    diff --git a/drivers/block/rnbd/rnbd-clt.c b/drivers/block/rnbd/rnbd-clt.c
    index 45a470076652..5ab7319ff2ea 100644
    --- a/drivers/block/rnbd/rnbd-clt.c
    +++ b/drivers/block/rnbd/rnbd-clt.c
    @@ -693,7 +693,11 @@ static void remap_devs(struct rnbd_clt_session *sess)
    return;
    }

    - rtrs_clt_query(sess->rtrs, &attrs);
    + err = rtrs_clt_query(sess->rtrs, &attrs);
    + if (err) {
    + pr_err("rtrs_clt_query(\"%s\"): %d\n", sess->sessname, err);
    + return;
    + }
    mutex_lock(&sess->lock);
    sess->max_io_size = attrs.max_io_size;

    @@ -1234,7 +1238,11 @@ find_and_get_or_create_sess(const char *sessname,
    err = PTR_ERR(sess->rtrs);
    goto wake_up_and_put;
    }
    - rtrs_clt_query(sess->rtrs, &attrs);
    +
    + err = rtrs_clt_query(sess->rtrs, &attrs);
    + if (err)
    + goto close_rtrs;
    +
    sess->max_io_size = attrs.max_io_size;
    sess->queue_depth = attrs.queue_depth;

    --
    2.30.2


    \
     
     \ /
      Last update: 2021-05-17 17:30    [W:4.076 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site