All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Yu Kuai <yukuai3@huawei.com>, Hou Tao <houtao1@huawei.com>,
	Josef Bacik <josef@toxicpanda.com>, Jens Axboe <axboe@kernel.dk>,
	Sasha Levin <sashal@kernel.org>,
	linux-block@vger.kernel.org, nbd@other.debian.org
Subject: [PATCH AUTOSEL 5.15 45/51] nbd: fix race between nbd_alloc_config() and module removal
Date: Tue,  7 Jun 2022 13:55:44 -0400	[thread overview]
Message-ID: <20220607175552.479948-45-sashal@kernel.org> (raw)
In-Reply-To: <20220607175552.479948-1-sashal@kernel.org>

From: Yu Kuai <yukuai3@huawei.com>

[ Upstream commit c55b2b983b0fa012942c3eb16384b2b722caa810 ]

When nbd module is being removing, nbd_alloc_config() may be
called concurrently by nbd_genl_connect(), although try_module_get()
will return false, but nbd_alloc_config() doesn't handle it.

The race may lead to the leak of nbd_config and its related
resources (e.g, recv_workq) and oops in nbd_read_stat() due
to the unload of nbd module as shown below:

  BUG: kernel NULL pointer dereference, address: 0000000000000040
  Oops: 0000 [#1] SMP PTI
  CPU: 5 PID: 13840 Comm: kworker/u17:33 Not tainted 5.14.0+ #1
  Hardware name: QEMU Standard PC (i440FX + PIIX, 1996)
  Workqueue: knbd16-recv recv_work [nbd]
  RIP: 0010:nbd_read_stat.cold+0x130/0x1a4 [nbd]
  Call Trace:
   recv_work+0x3b/0xb0 [nbd]
   process_one_work+0x1ed/0x390
   worker_thread+0x4a/0x3d0
   kthread+0x12a/0x150
   ret_from_fork+0x22/0x30

Fixing it by checking the return value of try_module_get()
in nbd_alloc_config(). As nbd_alloc_config() may return ERR_PTR(-ENODEV),
assign nbd->config only when nbd_alloc_config() succeeds to ensure
the value of nbd->config is binary (valid or NULL).

Also adding a debug message to check the reference counter
of nbd_config during module removal.

Signed-off-by: Hou Tao <houtao1@huawei.com>
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Link: https://lore.kernel.org/r/20220521073749.3146892-3-yukuai3@huawei.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/block/nbd.c | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 576ff4b59b32..e5d0c7a1748b 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -1463,15 +1463,20 @@ static struct nbd_config *nbd_alloc_config(void)
 {
 	struct nbd_config *config;
 
+	if (!try_module_get(THIS_MODULE))
+		return ERR_PTR(-ENODEV);
+
 	config = kzalloc(sizeof(struct nbd_config), GFP_NOFS);
-	if (!config)
-		return NULL;
+	if (!config) {
+		module_put(THIS_MODULE);
+		return ERR_PTR(-ENOMEM);
+	}
+
 	atomic_set(&config->recv_threads, 0);
 	init_waitqueue_head(&config->recv_wq);
 	init_waitqueue_head(&config->conn_wait);
 	config->blksize_bits = NBD_DEF_BLKSIZE_BITS;
 	atomic_set(&config->live_connections, 0);
-	try_module_get(THIS_MODULE);
 	return config;
 }
 
@@ -1498,12 +1503,13 @@ static int nbd_open(struct block_device *bdev, fmode_t mode)
 			mutex_unlock(&nbd->config_lock);
 			goto out;
 		}
-		config = nbd->config = nbd_alloc_config();
-		if (!config) {
-			ret = -ENOMEM;
+		config = nbd_alloc_config();
+		if (IS_ERR(config)) {
+			ret = PTR_ERR(config);
 			mutex_unlock(&nbd->config_lock);
 			goto out;
 		}
+		nbd->config = config;
 		refcount_set(&nbd->config_refs, 1);
 		refcount_inc(&nbd->refs);
 		mutex_unlock(&nbd->config_lock);
@@ -1910,13 +1916,14 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info)
 		nbd_put(nbd);
 		return -EINVAL;
 	}
-	config = nbd->config = nbd_alloc_config();
-	if (!nbd->config) {
+	config = nbd_alloc_config();
+	if (IS_ERR(config)) {
 		mutex_unlock(&nbd->config_lock);
 		nbd_put(nbd);
 		printk(KERN_ERR "nbd: couldn't allocate config\n");
-		return -ENOMEM;
+		return PTR_ERR(config);
 	}
+	nbd->config = config;
 	refcount_set(&nbd->config_refs, 1);
 	set_bit(NBD_RT_BOUND, &config->runtime_flags);
 
@@ -2488,6 +2495,9 @@ static void __exit nbd_cleanup(void)
 	while (!list_empty(&del_list)) {
 		nbd = list_first_entry(&del_list, struct nbd_device, list);
 		list_del_init(&nbd->list);
+		if (refcount_read(&nbd->config_refs))
+			printk(KERN_ERR "nbd: possibly leaking nbd_config (ref %d)\n",
+					refcount_read(&nbd->config_refs));
 		if (refcount_read(&nbd->refs) != 1)
 			printk(KERN_ERR "nbd: possibly leaking a device\n");
 		nbd_put(nbd);
-- 
2.35.1


  parent reply	other threads:[~2022-06-07 18:39 UTC|newest]

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-07 17:55 [PATCH AUTOSEL 5.15 01/51] iio: dummy: iio_simple_dummy: check the return value of kstrdup() Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 02/51] staging: rtl8712: fix a potential memory leak in r871xu_drv_init() Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 03/51] iio: st_sensors: Add a local lock for protecting odr Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 04/51] lkdtm/usercopy: Expand size of "out of frame" object Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 05/51] drivers: staging: rtl8723bs: Fix deadlock in rtw_surveydone_event_callback() Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 06/51] drivers: staging: rtl8192bs: Fix deadlock in rtw_joinbss_event_prehandle() Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 07/51] tty: synclink_gt: Fix null-pointer-dereference in slgt_clean() Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 08/51] tty: Fix a possible resource leak in icom_probe Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 09/51] thunderbolt: Use different lane for second DisplayPort tunnel Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 10/51] drivers: staging: rtl8192u: Fix deadlock in ieee80211_beacons_stop() Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 11/51] drivers: staging: rtl8192e: Fix deadlock in rtllib_beacons_stop() Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 12/51] USB: host: isp116x: check return value after calling platform_get_resource() Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 13/51] drivers: tty: serial: Fix deadlock in sa1100_set_termios() Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 14/51] drivers: usb: host: Fix deadlock in oxu_bus_suspend() Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 15/51] USB: hcd-pci: Fully suspend across freeze/thaw cycle Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 16/51] char: xillybus: fix a refcount leak in cleanup_dev() Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 17/51] sysrq: do not omit current cpu when showing backtrace of all active CPUs Sasha Levin
2022-06-07 17:55   ` Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 18/51] usb: dwc2: gadget: don't reset gadget's driver->bus Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 19/51] soundwire: qcom: adjust autoenumeration timeout Sasha Levin
2022-06-07 17:55   ` Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 20/51] misc: rtsx: set NULL intfdata when probe fails Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 21/51] extcon: Fix extcon_get_extcon_dev() error handling Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 22/51] extcon: Modify extcon device to be created after driver data is set Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 23/51] clocksource/drivers/sp804: Avoid error on multiple instances Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 24/51] staging: rtl8723bs: Fix alignment to match open parenthesis Sasha Levin
2022-06-08  0:04   ` Joe Perches
2022-06-08  6:15     ` Greg Kroah-Hartman
2022-06-09 13:55       ` Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 25/51] staging: rtl8712: fix uninit-value in usb_read8() and friends Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 26/51] staging: rtl8712: fix uninit-value in r871xu_drv_init() Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 27/51] serial: msm_serial: disable interrupts in __msm_console_write() Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 28/51] accessiblity: speakup: Add missing misc_deregister in softsynth_probe Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 29/51] kernfs: Separate kernfs_pr_cont_buf and rename_lock Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 30/51] watchdog: wdat_wdt: Stop watchdog when rebooting the system Sasha Levin
2022-06-07 17:55 ` [dm-devel] [PATCH AUTOSEL 5.15 31/51] md: don't unregister sync_thread with reconfig_mutex held Sasha Levin
2022-06-07 17:55   ` Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 32/51] md: protect md_unregister_thread from reentrancy Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 33/51] scsi: myrb: Fix up null pointer access on myrb_cleanup() Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 34/51] Revert "net: af_key: add check for pfkey_broadcast in function pfkey_process" Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 35/51] ceph: allow ceph.dir.rctime xattr to be updatable Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 36/51] ceph: flush the mdlog for filesystem sync Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 37/51] drm/amd/display: Check if modulo is 0 before dividing Sasha Levin
2022-06-07 17:55   ` Sasha Levin
2022-06-07 17:55   ` Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 38/51] drm/radeon: fix a possible null pointer dereference Sasha Levin
2022-06-07 17:55   ` Sasha Levin
2022-06-07 17:55   ` Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 39/51] drm/amd/pm: Fix missing thermal throttler status Sasha Levin
2022-06-07 17:55   ` Sasha Levin
2022-06-07 17:55   ` Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 40/51] um: line: Use separate IRQs per line Sasha Levin
2022-06-07 17:55   ` Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 41/51] modpost: fix undefined behavior of is_arm_mapping_symbol() Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 42/51] x86/cpu: Elide KCSAN for cpu_has() and friends Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 43/51] jump_label,noinstr: Avoid instrumentation for JUMP_LABEL=n builds Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 44/51] nbd: call genl_unregister_family() first in nbd_cleanup() Sasha Levin
2022-06-07 17:55 ` Sasha Levin [this message]
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 46/51] nbd: fix io hung while disconnecting device Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 47/51] fs/ntfs3: Fix invalid free in log_replay Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 48/51] s390/gmap: voluntarily schedule during key setting Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 49/51] cifs: version operations for smb20 unneeded when legacy support disabled Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 50/51] drm/amd/pm: use bitmap_{from, to}_arr32 where appropriate Sasha Levin
2022-06-07 17:55   ` [PATCH AUTOSEL 5.15 50/51] drm/amd/pm: use bitmap_{from,to}_arr32 " Sasha Levin
2022-06-07 17:55   ` [PATCH AUTOSEL 5.15 50/51] drm/amd/pm: use bitmap_{from, to}_arr32 " Sasha Levin
2022-06-07 17:55 ` [PATCH AUTOSEL 5.15 51/51] nodemask: Fix return values to be unsigned Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220607175552.479948-45-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=axboe@kernel.dk \
    --cc=houtao1@huawei.com \
    --cc=josef@toxicpanda.com \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nbd@other.debian.org \
    --cc=stable@vger.kernel.org \
    --cc=yukuai3@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.