From: Keith Busch <keith.busch@intel.com>
To: Christoph Hellwig <hch@lst.de>
Cc: scott.bauer@intel.com, jonathan.derrick@intel.com, axboe@fb.com,
linux-block@vger.kernel.org, linux-nvme@lists.infradead.org
Subject: Re: [PATCH 4/4] nvme: re-check security protocol support after reset
Date: Fri, 17 Feb 2017 10:26:51 -0500 [thread overview]
Message-ID: <20170217152651.GA18275@localhost.localdomain> (raw)
In-Reply-To: <20170217125941.14319-5-hch@lst.de>
On Fri, Feb 17, 2017 at 01:59:41PM +0100, Christoph Hellwig wrote:
> @@ -1789,7 +1789,8 @@ static void nvme_reset_work(struct work_struct *work)
> if (result)
> goto out;
>
> - if ((dev->ctrl.oacs & NVME_CTRL_OACS_SEC_SUPP) && !dev->ctrl.opal_dev) {
> + kfree(dev->ctrl.opal_dev);
> + if (dev->ctrl.oacs & NVME_CTRL_OACS_SEC_SUPP) {
> dev->ctrl.opal_dev =
> init_opal_dev(&dev->ctrl, &nvme_sec_submit);
> }
A couple things.
This has a use-after-free in opal_unlock_from_suspend if the nvme
device had an opal_dev before, but no longer support the capability
after resume. So you'd want to set ctrl.opal_dev to NULL after the free.
But we don't want to unconditionally free it anyway during resume
since opal_unlock_from_suspend requires the exisiting opal_dev state
information saved in the 'unlk_list'.
Something like this instead:
---
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index ddc51ad..8fa6be9 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1789,13 +1789,17 @@ static void nvme_reset_work(struct work_struct *work)
if (result)
goto out;
- if ((dev->ctrl.oacs & NVME_CTRL_OACS_SEC_SUPP) && !dev->ctrl.opal_dev) {
- dev->ctrl.opal_dev =
- init_opal_dev(&dev->ctrl, &nvme_sec_submit);
+ if (dev->ctrl.oacs & NVME_CTRL_OACS_SEC_SUPP)
+ if (was_suspend && dev->ctrl.opal_dev)
+ opal_unlock_from_suspend(dev->ctrl.opal_dev);
+ else if (!dev->ctrl.opal_dev)
+ dev->ctrl.opal_dev =
+ init_opal_dev(&dev->ctrl, &nvme_sec_submit);
+ } else {
+ kfree(dev->ctrl.opal_dev);
+ dev->ctrl.opal_dev = NULL;
}
- if (was_suspend)
- opal_unlock_from_suspend(dev->ctrl.opal_dev);
result = nvme_setup_io_queues(dev);
if (result)
--
next prev parent reply other threads:[~2017-02-17 15:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-17 12:59 OPAL fixups Christoph Hellwig
2017-02-17 12:59 ` [PATCH 1/4] block/sed-opal: tone down not supported warnings Christoph Hellwig
2017-02-17 12:59 ` [PATCH 2/4] block/sed-opal: allocate struct opal_dev dynamically Christoph Hellwig
2017-02-17 12:59 ` [PATCH 3/4] nvme: Check for Security send/recv support before issuing commands Christoph Hellwig
2017-02-17 12:59 ` [PATCH 4/4] nvme: re-check security protocol support after reset Christoph Hellwig
2017-02-17 15:26 ` Keith Busch [this message]
2017-02-17 15:41 ` Scott Bauer
2017-02-17 17:01 ` Christoph Hellwig
2017-02-17 16:55 ` Scott Bauer
2017-02-17 17:16 ` Christoph Hellwig
2017-02-17 15:27 ` OPAL fixups Keith Busch
2017-02-17 19:42 ` Jens Axboe
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=20170217152651.GA18275@localhost.localdomain \
--to=keith.busch@intel.com \
--cc=axboe@fb.com \
--cc=hch@lst.de \
--cc=jonathan.derrick@intel.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=scott.bauer@intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox