Commit 5cd308df authored by Maurizio Lombardi's avatar Maurizio Lombardi Committed by Zheng Qixing
Browse files

nvme-pci: fix race condition between reset and nvme_dev_disable() 

mainline inclusion
from mainline-v6.12-rc4
commit 26bc0a81f64ce00fc4342c38eeb2eddaad084dd2
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IB2BXE
CVE: CVE-2024-50135

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=26bc0a81f64ce00fc4342c38eeb2eddaad084dd2



---------------------------

nvme_dev_disable() modifies the dev->online_queues field, therefore
nvme_pci_update_nr_queues() should avoid racing against it, otherwise
we could end up passing invalid values to blk_mq_update_nr_hw_queues().

 WARNING: CPU: 39 PID: 61303 at drivers/pci/msi/api.c:347
          pci_irq_get_affinity+0x187/0x210
 Workqueue: nvme-reset-wq nvme_reset_work [nvme]
 RIP: 0010:pci_irq_get_affinity+0x187/0x210
 Call Trace:
  <TASK>
  ? blk_mq_pci_map_queues+0x87/0x3c0
  ? pci_irq_get_affinity+0x187/0x210
  blk_mq_pci_map_queues+0x87/0x3c0
  nvme_pci_map_queues+0x189/0x460 [nvme]
  blk_mq_update_nr_hw_queues+0x2a/0x40
  nvme_reset_work+0x1be/0x2a0 [nvme]

Fix the bug by locking the shutdown_lock mutex before using
dev->online_queues. Give up if nvme_dev_disable() is running or if
it has been executed already.

Fixes: 949928c1 ("NVMe: Fix possible queue use after freed")
Tested-by: default avatarYi Zhang <yi.zhang@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMaurizio Lombardi <mlombard@redhat.com>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>

Conflicts:
	drivers/nvme/host/pci.c
[Context conflict.]
Signed-off-by: default avatarZheng Qixing <zhengqixing@huawei.com>
parent 8d3ef5fd

drivers/nvme/host/pci.c

+15 −2
Original line number Diff line number Diff line
@@ -2351,11 +2351,23 @@ static void nvme_pci_alloc_tag_set(struct nvme_dev *dev) 
	dev->ctrl.tagset = set;

}



static void nvme_pci_update_nr_queues(struct nvme_dev *dev)

static bool nvme_pci_update_nr_queues(struct nvme_dev *dev)

{

	/* Give up if we are racing with nvme_dev_disable() */

	if (!mutex_trylock(&dev->shutdown_lock))

		return false;



	/* Check if nvme_dev_disable() has been executed already */

	if (!dev->online_queues) {

		mutex_unlock(&dev->shutdown_lock);

		return false;

	}



	blk_mq_update_nr_hw_queues(&dev->tagset, dev->online_queues - 1);

	/* free previously allocated queues that are no longer usable */

	nvme_free_queues(dev, dev->online_queues);

	mutex_unlock(&dev->shutdown_lock);

	return true;

}



static int nvme_pci_enable(struct nvme_dev *dev)
@@ -2712,7 +2724,8 @@ static void nvme_reset_work(struct work_struct *work) 
		if (dev->online_queues > 1) {

			nvme_start_queues(&dev->ctrl);

			nvme_wait_freeze(&dev->ctrl);

			nvme_pci_update_nr_queues(dev);

			if (!nvme_pci_update_nr_queues(dev))

				goto out;

			nvme_dbbuf_set(dev);

			nvme_unfreeze(&dev->ctrl);

		} else {