From patchwork Mon Oct 24 11:33:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9468 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp480351wru; Mon, 24 Oct 2022 07:20:50 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7lFF4lKfQq7dsWb7kmn9g48ykWJ5qEt9dARo+0kBEEUY6cHkZuh62RXC0Pb7gFWjrJMUeS X-Received: by 2002:a05:6402:884:b0:461:1ed:579f with SMTP id e4-20020a056402088400b0046101ed579fmr19858493edy.413.1666621249911; Mon, 24 Oct 2022 07:20:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666621249; cv=none; d=google.com; s=arc-20160816; b=yIBllxLLwsV7RftiS/OASoYzvWLTWqcXQvpmtn5W3lfWWdgJ3EHNtq2zEPcgSd2Z31 9+dcQKCKTPLnFH4d4GGCc26TRvvI8cCbgisjLWf9FKYXt+KMFDEEt3U1wBeQDWsP9iMo dSU7Yion5T33iZLoP6JdU34ODhNzjZU5fmejAARNcj0AqQXaPl7H71ovHgVYhTsZm/VC bMK2YtOpEeR8zZw2IyiOFpOhPqmfnQDXFl4SmQfiDjQ0yo633JjggBoYcrTWfX/uQkny +u9XWoBmODnExnbWETZdlTMbMfxFgkCP64SVORfxDtY5PivKaRMTTsZP1WH2KdCP4h63 DmIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=l/jJq7MnGHm9gvqc8F56IvEzvEO21bdw3eK1P33ARVs=; b=o2LfntRnNkGQPaA+/c3wzYs64WRJbjQlcWO6sCoZtT8nPV3dunpKqxXnLniV9J702x sYuw4WJkxRHMqbpUIeGittZ3DMjC2z51BEF9nmWclrvl+Inp7FToWpYaFRlPVpoZbODH FSHi/J5XWiJTrCYDI1M9DFj2ubhpjVhaItEK0t1O7STed8QGO8u3WQ49XBcQHt+4sCOV 7vwEQ/+4Wq8szy3AqBE+Lx0FXLgaXzr92CgXI4tKlqhkpVcYh83xDC7Q7nfswzy+cgYl d+MGRT2c5jM0/PXEv2NrP5Ds510rLKzvjCfUfGRvxwPXzuOwoxLsjsVDuyIqgj5ZlXb6 JtBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YjIsjq2P; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ec33-20020a0564020d6100b004615a57e292si7782203edb.426.2022.10.24.07.20.20; Mon, 24 Oct 2022 07:20:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YjIsjq2P; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234307AbiJXOSV (ORCPT + 99 others); Mon, 24 Oct 2022 10:18:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236912AbiJXOPT (ORCPT ); Mon, 24 Oct 2022 10:15:19 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 631B3356F2; Mon, 24 Oct 2022 05:55:11 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 74C8361290; Mon, 24 Oct 2022 12:54:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8551DC433D7; Mon, 24 Oct 2022 12:54:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666616056; bh=Qq5cqGeTeMGpEVXtKhhwlv6hcwVtjhamt4f+1/vSqbU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YjIsjq2PYHXameee2r2rvJ44iowcp57lXcHdhJVfHmxXbABcG9avcNan0FoMlhGsE eaEyOfcGy8IzRHARnye6wWEkYVCwN8mNHmf7nOfrsLhK5s4tvpcfv4pSh/bvSZu192 FWjUk0+f25jbHifrd2fWiHVX7BjHAQdYv2z4Y+X4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+38e6c55d4969a14c1534@syzkaller.appspotmail.com, Shigeru Yoshida , Josef Bacik , Jens Axboe , Sasha Levin Subject: [PATCH 5.15 484/530] nbd: Fix hung when signal interrupts nbd_start_device_ioctl() Date: Mon, 24 Oct 2022 13:33:48 +0200 Message-Id: <20221024113106.965785057@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747579043864779455?= X-GMAIL-MSGID: =?utf-8?q?1747579043864779455?= From: Shigeru Yoshida [ Upstream commit 1de7c3cf48fc41cd95adb12bd1ea9033a917798a ] 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 Reviewed-by: Josef Bacik Link: https://lore.kernel.org/r/20220907163502.577561-1-syoshida@redhat.com Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/nbd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index b391ca062add..ec2b5dd2ce4a 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -1351,10 +1351,12 @@ static int nbd_start_device_ioctl(struct nbd_device *nbd, struct block_device *b mutex_unlock(&nbd->config_lock); ret = wait_event_interruptible(config->recv_wq, atomic_read(&config->recv_threads) == 0); - if (ret) + if (ret) { sock_shutdown(nbd); - flush_workqueue(nbd->recv_workq); + nbd_clear_que(nbd); + } + flush_workqueue(nbd->recv_workq); mutex_lock(&nbd->config_lock); nbd_bdev_reset(bdev); /* user requested, ignore socket errors */