Skip to content

Commit 1de7c3c

Browse files
Shigeru Yoshidaaxboe
authored andcommitted
nbd: Fix hung when signal interrupts nbd_start_device_ioctl()
syzbot reported hung task [1]. The following program is a simplified version of the reproducer: int main(void) { int sv[2], fd; if (socketpair(AF_UNIX, SOCK_STREAM, 0, sv) < 0) return 1; if ((fd = open("/dev/nbd0", 0)) < 0) return 1; if (ioctl(fd, NBD_SET_SIZE_BLOCKS, 0x81) < 0) return 1; if (ioctl(fd, NBD_SET_SOCK, sv[0]) < 0) return 1; if (ioctl(fd, NBD_DO_IT) < 0) return 1; return 0; } When signal interrupt nbd_start_device_ioctl() waiting the condition atomic_read(&config->recv_threads) == 0, the task can hung because it waits the completion of the inflight IOs. This patch fixes the issue by clearing queue, not just shutdown, when signal interrupt nbd_start_device_ioctl(). Link: https://syzkaller.appspot.com/bug?id=7d89a3ffacd2b83fdd39549bc4d8e0a89ef21239 [1] Reported-by: syzbot+38e6c55d4969a14c1534@syzkaller.appspotmail.com Signed-off-by: Shigeru Yoshida <syoshida@redhat.com> Reviewed-by: Josef Bacik <josef@toxicpanda.com> Link: https://lore.kernel.org/r/20220907163502.577561-1-syoshida@redhat.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 48c0333 commit 1de7c3c

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

drivers/block/nbd.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1413,10 +1413,12 @@ static int nbd_start_device_ioctl(struct nbd_device *nbd)
14131413
mutex_unlock(&nbd->config_lock);
14141414
ret = wait_event_interruptible(config->recv_wq,
14151415
atomic_read(&config->recv_threads) == 0);
1416-
if (ret)
1416+
if (ret) {
14171417
sock_shutdown(nbd);
1418-
flush_workqueue(nbd->recv_workq);
1418+
nbd_clear_que(nbd);
1419+
}
14191420

1421+
flush_workqueue(nbd->recv_workq);
14201422
mutex_lock(&nbd->config_lock);
14211423
nbd_bdev_reset(nbd);
14221424
/* user requested, ignore socket errors */

0 commit comments

Comments
 (0)