linux-nvme.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: keith.busch@linux.intel.com (Keith Busch)
Subject: [PATCH] nvme: Fix handling of metadata_len for NVME_IOCTL_IO_CMD
Date: Fri, 20 Jul 2018 08:26:32 -0600	[thread overview]
Message-ID: <20180720142632.GC4093@localhost.localdomain> (raw)
In-Reply-To: <20180720030759.30254-1-roland@kernel.org>

On Thu, Jul 19, 2018@08:07:59PM -0700, Roland Dreier wrote:
> From: Roland Dreier <roland at purestorage.com>
> 
> The old code in nvme_user_cmd() passed the userspace virtual address
> from nvme_passthru_cmd.metadata as the length of the metadata buffer
> as well as the address to nvme_submit_user_cmd().
> 
> Signed-off-by: Roland Dreier <roland at purestorage.com>
> ---
>  drivers/nvme/host/core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
> index 46df030b2c3f..4e2a48b574cc 100644
> --- a/drivers/nvme/host/core.c
> +++ b/drivers/nvme/host/core.c
> @@ -1218,7 +1218,7 @@ static int nvme_user_cmd(struct nvme_ctrl *ctrl, struct nvme_ns *ns,
>  	effects = nvme_passthru_start(ctrl, ns, cmd.opcode);
>  	status = nvme_submit_user_cmd(ns ? ns->queue : ctrl->admin_q, &c,
>  			(void __user *)(uintptr_t)cmd.addr, cmd.data_len,
> -			(void __user *)(uintptr_t)cmd.metadata, cmd.metadata,
> +			(void __user *)(uintptr_t)cmd.metadata, cmd.metadata_len,
>  			0, &cmd.result, timeout);
>  	nvme_passthru_end(ctrl, effects);
>  
> -- 
> 2.17.1

Oops, doesn't look like this path was ever tested with metadata! Thanks
for the fix.

Reviewed-by: Keith Busch <keith.busch at intel.com>

  reply	other threads:[~2018-07-20 14:26 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-20  3:07 [PATCH] nvme: Fix handling of metadata_len for NVME_IOCTL_IO_CMD Roland Dreier
2018-07-20 14:26 ` Keith Busch [this message]
2018-07-20 14:47 ` Christoph Hellwig

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=20180720142632.GC4093@localhost.localdomain \
    --to=keith.busch@linux.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;
as well as URLs for NNTP newsgroup(s).