* [PATCH] nbd: error out if socket index doesn't match in nbd_handle_reply()
@ 2021-11-01 9:25 Yu Kuai
2021-11-01 22:23 ` Josef Bacik
2021-11-02 20:42 ` Jens Axboe
0 siblings, 2 replies; 3+ messages in thread
From: Yu Kuai @ 2021-11-01 9:25 UTC (permalink / raw)
To: josef, axboe; +Cc: linux-block, nbd, linux-kernel, yukuai3, yi.zhang
commit fcf3d633d8e1 ("nbd: check sock index in nbd_read_stat()") just
add error message when socket index doesn't match. Since the request
and reply must be transmitted over the same socket, it's ok to error
out in such situation.
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
drivers/block/nbd.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index b47b2a87ae8f..18da6385645c 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -755,6 +755,8 @@ static struct nbd_cmd *nbd_handle_reply(struct nbd_device *nbd, int index,
if (cmd->index != index) {
dev_err(disk_to_dev(nbd->disk), "Unexpected reply %d from different sock %d (expected %d)",
tag, index, cmd->index);
+ ret = -ENOENT;
+ goto out;
}
if (cmd->cmd_cookie != nbd_handle_to_cookie(handle)) {
dev_err(disk_to_dev(nbd->disk), "Double reply on req %p, cmd_cookie %u, handle cookie %u\n",
--
2.31.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] nbd: error out if socket index doesn't match in nbd_handle_reply()
2021-11-01 9:25 [PATCH] nbd: error out if socket index doesn't match in nbd_handle_reply() Yu Kuai
@ 2021-11-01 22:23 ` Josef Bacik
2021-11-02 20:42 ` Jens Axboe
1 sibling, 0 replies; 3+ messages in thread
From: Josef Bacik @ 2021-11-01 22:23 UTC (permalink / raw)
To: Yu Kuai; +Cc: axboe, linux-block, nbd, linux-kernel, yi.zhang
On Mon, Nov 01, 2021 at 05:25:38PM +0800, Yu Kuai wrote:
> commit fcf3d633d8e1 ("nbd: check sock index in nbd_read_stat()") just
> add error message when socket index doesn't match. Since the request
> and reply must be transmitted over the same socket, it's ok to error
> out in such situation.
>
> Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Thanks,
Josef
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] nbd: error out if socket index doesn't match in nbd_handle_reply()
2021-11-01 9:25 [PATCH] nbd: error out if socket index doesn't match in nbd_handle_reply() Yu Kuai
2021-11-01 22:23 ` Josef Bacik
@ 2021-11-02 20:42 ` Jens Axboe
1 sibling, 0 replies; 3+ messages in thread
From: Jens Axboe @ 2021-11-02 20:42 UTC (permalink / raw)
To: josef, Yu Kuai; +Cc: yi.zhang, linux-block, nbd, linux-kernel
On Mon, 1 Nov 2021 17:25:38 +0800, Yu Kuai wrote:
> commit fcf3d633d8e1 ("nbd: check sock index in nbd_read_stat()") just
> add error message when socket index doesn't match. Since the request
> and reply must be transmitted over the same socket, it's ok to error
> out in such situation.
>
>
Applied, thanks!
[1/1] nbd: error out if socket index doesn't match in nbd_handle_reply()
commit: 494dbee341e7a02529ce776ee9a5e0b7733ca280
Best regards,
--
Jens Axboe
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-11-02 20:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-01 9:25 [PATCH] nbd: error out if socket index doesn't match in nbd_handle_reply() Yu Kuai
2021-11-01 22:23 ` Josef Bacik
2021-11-02 20:42 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).