Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp377007pxj; Tue, 18 May 2021 05:33:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0m7mk4Vcz4kj+QF2ANzBBf3G9HxlGRgION4NBna3niKrL6G3uchqweoNUO6KoQmxeXzYL X-Received: by 2002:a05:6402:2064:: with SMTP id bd4mr6619245edb.96.1621341183217; Tue, 18 May 2021 05:33:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621341183; cv=none; d=google.com; s=arc-20160816; b=gqxkPJ58831PYOThwSdi3Gzx+XRcpJQ05UYqCXCvHe+sgVaS5rI5WbDgEJ97jgZa1J 6bb3PxivSkxnee7iB641Y2PzZhVSQLxyjY25AgQSaSsNzxrck1yN6n8Za9W/kc2GC9qH 7fEOzdrxniP8MM/Z6JBy38umRajCTLLxw11Ms1D29UY2PzfThnzJmtdACZQM5zwp+fqr kiI1SbcpsaMSlY8fMtFmiYeHF04/w2xLcc2RIN5rg/c7wgqhdtIqi3UgxgTrYFuRQfYr a4ABQmLe1LRRTf6xK+zi1E7wKDg0eCQ2Y/bjArpFe12D6owe6veOwsrRDHDxhWitqaoZ BoHA== 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=J4gmIerzM6kz7VjVWQ/Cxst1DQAE/FlUb0hHYpBc3co=; b=M2/cOs3fH5NPAz4zsZMoim8FD3nnC5q7RMR0oA8uvkzXbWPpr/QvUiFRG1XINBbmjR k/noVYYA0g+emvbodeCAGdCLvMztkN3sgDlGxTXzsYfbo5mTMatL2cuAXho53gDqNfEl 4PdZogqFPS3xmxK8mU6kZ7btGIKWtODptFrYxvzyDjI4t8eoIG1hzLf7ArAu+5+liEQv zLEXBsaPrq8XEeEJW4L6V1hRltOHYV8Rtkby/I13L6p38I8AkveWFj8iEaMOC9EXzwcz B1NNanflxMYvQdLDKOycVBaR1sL7leeZcrlm19UurzWFB70527BYQ2Wr+VvZWzNEPjOD 9eDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=f2zrpLVK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z11si11928754edc.37.2021.05.18.05.32.40; Tue, 18 May 2021 05:33:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=f2zrpLVK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S245354AbhEQP3J (ORCPT + 99 others); Mon, 17 May 2021 11:29:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:36846 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243531AbhEQPOS (ORCPT ); Mon, 17 May 2021 11:14:18 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BF79561C58; Mon, 17 May 2021 14:32:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621261923; bh=TEp1EG3yspT8+xDgcjLvQtVCGgTQcCl0Xr0LFyf6jyU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f2zrpLVKOOhYV5MjOakvVwiNTHgoMk7hilC4Egmgjy0JCDGEU1uAeUaTjxUyuFcZ4 xv0gfDy6I/mShJlAbi6wJcfOCMkqf6FlfywTM9AfFGYNZGHSpt4Y/+T6O1CADwEEl8 /6apGxPswBv4wzC/ZKApjcQTgx/A03KgJJLmeSJ8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sun Ke , Josef Bacik , Jens Axboe , Sasha Levin Subject: [PATCH 5.4 110/141] nbd: Fix NULL pointer in flush_workqueue Date: Mon, 17 May 2021 16:02:42 +0200 Message-Id: <20210517140246.501214997@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517140242.729269392@linuxfoundation.org> References: <20210517140242.729269392@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sun Ke [ Upstream commit 79ebe9110fa458d58f1fceb078e2068d7ad37390 ] Open /dev/nbdX first, the config_refs will be 1 and the pointers in nbd_device are still null. Disconnect /dev/nbdX, then reference a null recv_workq. The protection by config_refs in nbd_genl_disconnect is useless. [ 656.366194] BUG: kernel NULL pointer dereference, address: 0000000000000020 [ 656.368943] #PF: supervisor write access in kernel mode [ 656.369844] #PF: error_code(0x0002) - not-present page [ 656.370717] PGD 10cc87067 P4D 10cc87067 PUD 1074b4067 PMD 0 [ 656.371693] Oops: 0002 [#1] SMP [ 656.372242] CPU: 5 PID: 7977 Comm: nbd-client Not tainted 5.11.0-rc5-00040-g76c057c84d28 #1 [ 656.373661] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS ?-20190727_073836-buildvm-ppc64le-16.ppc.fedoraproject.org-3.fc31 04/01/2014 [ 656.375904] RIP: 0010:mutex_lock+0x29/0x60 [ 656.376627] Code: 00 0f 1f 44 00 00 55 48 89 fd 48 83 05 6f d7 fe 08 01 e8 7a c3 ff ff 48 83 05 6a d7 fe 08 01 31 c0 65 48 8b 14 25 00 6d 01 00 48 0f b1 55 d [ 656.378934] RSP: 0018:ffffc900005eb9b0 EFLAGS: 00010246 [ 656.379350] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 [ 656.379915] RDX: ffff888104cf2600 RSI: ffffffffaae8f452 RDI: 0000000000000020 [ 656.380473] RBP: 0000000000000020 R08: 0000000000000000 R09: ffff88813bd6b318 [ 656.381039] R10: 00000000000000c7 R11: fefefefefefefeff R12: ffff888102710b40 [ 656.381599] R13: ffffc900005eb9e0 R14: ffffffffb2930680 R15: ffff88810770ef00 [ 656.382166] FS: 00007fdf117ebb40(0000) GS:ffff88813bd40000(0000) knlGS:0000000000000000 [ 656.382806] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 656.383261] CR2: 0000000000000020 CR3: 0000000100c84000 CR4: 00000000000006e0 [ 656.383819] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 656.384370] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 656.384927] Call Trace: [ 656.385111] flush_workqueue+0x92/0x6c0 [ 656.385395] nbd_disconnect_and_put+0x81/0xd0 [ 656.385716] nbd_genl_disconnect+0x125/0x2a0 [ 656.386034] genl_family_rcv_msg_doit.isra.0+0x102/0x1b0 [ 656.386422] genl_rcv_msg+0xfc/0x2b0 [ 656.386685] ? nbd_ioctl+0x490/0x490 [ 656.386954] ? genl_family_rcv_msg_doit.isra.0+0x1b0/0x1b0 [ 656.387354] netlink_rcv_skb+0x62/0x180 [ 656.387638] genl_rcv+0x34/0x60 [ 656.387874] netlink_unicast+0x26d/0x590 [ 656.388162] netlink_sendmsg+0x398/0x6c0 [ 656.388451] ? netlink_rcv_skb+0x180/0x180 [ 656.388750] ____sys_sendmsg+0x1da/0x320 [ 656.389038] ? ____sys_recvmsg+0x130/0x220 [ 656.389334] ___sys_sendmsg+0x8e/0xf0 [ 656.389605] ? ___sys_recvmsg+0xa2/0xf0 [ 656.389889] ? handle_mm_fault+0x1671/0x21d0 [ 656.390201] __sys_sendmsg+0x6d/0xe0 [ 656.390464] __x64_sys_sendmsg+0x23/0x30 [ 656.390751] do_syscall_64+0x45/0x70 [ 656.391017] entry_SYSCALL_64_after_hwframe+0x44/0xa9 To fix it, just add if (nbd->recv_workq) to nbd_disconnect_and_put(). Fixes: e9e006f5fcf2 ("nbd: fix max number of supported devs") Signed-off-by: Sun Ke Reviewed-by: Josef Bacik Link: https://lore.kernel.org/r/20210512114331.1233964-2-sunke32@huawei.com Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/nbd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index e11fddcb73b9..839364371f9a 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -2016,7 +2016,8 @@ static void nbd_disconnect_and_put(struct nbd_device *nbd) * config ref and try to destroy the workqueue from inside the work * queue. */ - flush_workqueue(nbd->recv_workq); + if (nbd->recv_workq) + flush_workqueue(nbd->recv_workq); if (test_and_clear_bit(NBD_RT_HAS_CONFIG_REF, &nbd->config->runtime_flags)) nbd_config_put(nbd); -- 2.30.2