From: Irvin Cote <irvincoteg@gmail.com>
To: hch@lst.de
Cc: kbusch@kernel.org, axboe@fb.com, sagi@grimberg.me,
linux-nvme@lists.infradead.org, chaitanyak@nvidia.com,
Irvin Cote <irvincoteg@gmail.com>
Subject: [PATCH 2/3] nvme-pci: Adjusting ctrl deref count
Date: Tue, 25 Apr 2023 18:18:35 -0300 [thread overview]
Message-ID: <20230425211836.14283-3-irvincoteg@gmail.com> (raw)
In-Reply-To: <20230425211836.14283-1-irvincoteg@gmail.com>
If there is a failure in nvme_init_ctrl
the dereference counting is not properly
handled and the code exits with a non-zero
ctrl ref-count. This is because nvme_init_ctrl
takes two refs but only accounts for one deref
in its teardown path. Instead of adding another deref
there in the core layer, we take care of it here and
we make sure that it is the last thing we do so that
all teardown logic executes before the release of
the controller as the two have some identical instructions.
Signed-off-by: Irvin Cote <irvincoteg@gmail.com>
---
drivers/nvme/host/pci.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index cd7873de3121..65e4b9f1b632 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2975,6 +2975,7 @@ static struct nvme_dev *nvme_pci_alloc_dev(struct pci_dev *pdev,
kfree(dev->queues);
out_free_dev:
kfree(dev);
+ nvme_put_ctrl(&dev->ctrl);
return ERR_PTR(ret);
}
--
2.39.2
next prev parent reply other threads:[~2023-04-25 21:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-25 21:18 [PATCH 0/3] Adjusting deref count in nvme_init_ctrl Irvin Cote
2023-04-25 21:18 ` [PATCH 1/3] nvme-core: nvme_init_ctrl cleanup Irvin Cote
2023-04-25 21:18 ` Irvin Cote [this message]
2023-04-25 21:18 ` [PATCH 3/3] nvme-core: preventing double freeing in ctrl release Irvin Cote
2023-04-25 21:45 ` Keith Busch
2023-04-25 23:19 ` irvin cote
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=20230425211836.14283-3-irvincoteg@gmail.com \
--to=irvincoteg@gmail.com \
--cc=axboe@fb.com \
--cc=chaitanyak@nvidia.com \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox