From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1691ECA9EC9 for ; Mon, 4 Nov 2019 22:18:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DA6DF204FD for ; Mon, 4 Nov 2019 22:18:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572905881; bh=+Y9I/xKZF4NhCZQjieOGVWzHKoWzM6aburW0P4Ayg5A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Y75/+EhKjdjrcnLTdSOw7cdtwp9EGXap2Z3zZCaB91U26dTdHJ+seXJyXk9zBe//o EbSFLRYduCyl9mu7hMylA7CqFhXZZEJYB4fcGejSyltT5aFcbWDIyb8NYOOUFgP6vX zzWaegAeCBxwbYOxT6S8VEa+6tW5/7XVSCV9RCHY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389226AbfKDWCO (ORCPT ); Mon, 4 Nov 2019 17:02:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:59554 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389048AbfKDWB0 (ORCPT ); Mon, 4 Nov 2019 17:01:26 -0500 Received: from localhost (6.204-14-84.ripe.coltfrance.com [84.14.204.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 91B00217F4; Mon, 4 Nov 2019 22:01:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572904886; bh=+Y9I/xKZF4NhCZQjieOGVWzHKoWzM6aburW0P4Ayg5A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Spvo7//yEzyToWPk5MtmxWUlL/NAjbHXLRLOdh3/cKoGV5WWIK+9Srtr0DProjNTn 0lHteHZOXblaXIQsZYQO9EJIv7jxllbPRRlDt/czcit6Y8PeEzzXPehAMNC5mGLEZg UJGQEGDGVQ4PUGwZ8SntgjArihuwF9NMX8KBaBE4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+24c12fa8d218ed26011a@syzkaller.appspotmail.com, "Richard W.M. Jones" , Mike Christie , Jens Axboe , Sasha Levin Subject: [PATCH 4.19 105/149] nbd: verify socket is supported during setup Date: Mon, 4 Nov 2019 22:44:58 +0100 Message-Id: <20191104212143.819122372@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191104212126.090054740@linuxfoundation.org> References: <20191104212126.090054740@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mike Christie [ Upstream commit cf1b2326b734896734c6e167e41766f9cee7686a ] nbd requires socket families to support the shutdown method so the nbd recv workqueue can be woken up from its sock_recvmsg call. If the socket does not support the callout we will leave recv works running or get hangs later when the device or module is removed. This adds a check during socket connection/reconnection to make sure the socket being passed in supports the needed callout. Reported-by: syzbot+24c12fa8d218ed26011a@syzkaller.appspotmail.com Fixes: e9e006f5fcf2 ("nbd: fix max number of supported devs") Tested-by: Richard W.M. Jones Signed-off-by: Mike Christie Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/nbd.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index d445195945618..bd9aafe86c2fc 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -924,6 +924,25 @@ static blk_status_t nbd_queue_rq(struct blk_mq_hw_ctx *hctx, return ret; } +static struct socket *nbd_get_socket(struct nbd_device *nbd, unsigned long fd, + int *err) +{ + struct socket *sock; + + *err = 0; + sock = sockfd_lookup(fd, err); + if (!sock) + return NULL; + + if (sock->ops->shutdown == sock_no_shutdown) { + dev_err(disk_to_dev(nbd->disk), "Unsupported socket: shutdown callout must be supported.\n"); + *err = -EINVAL; + return NULL; + } + + return sock; +} + static int nbd_add_socket(struct nbd_device *nbd, unsigned long arg, bool netlink) { @@ -933,7 +952,7 @@ static int nbd_add_socket(struct nbd_device *nbd, unsigned long arg, struct nbd_sock *nsock; int err; - sock = sockfd_lookup(arg, &err); + sock = nbd_get_socket(nbd, arg, &err); if (!sock) return err; @@ -985,7 +1004,7 @@ static int nbd_reconnect_socket(struct nbd_device *nbd, unsigned long arg) int i; int err; - sock = sockfd_lookup(arg, &err); + sock = nbd_get_socket(nbd, arg, &err); if (!sock) return err; -- 2.20.1