block/rnbd-clt: Check the return value of the function rtrs_clt_query
authorMd Haris Iqbal <haris.iqbal@cloud.ionos.com>
Wed, 28 Apr 2021 06:13:58 +0000 (08:13 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 May 2021 08:13:06 +0000 (10:13 +0200)
[ 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

index ba334fe..71b86fe 100644 (file)
@@ -679,7 +679,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;
 
@@ -1211,7 +1215,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;