Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a12f4ed authored by Roland Dreier's avatar Roland Dreier Committed by Greg Kroah-Hartman
Browse files

nvme: fix handling of metadata_len for NVME_IOCTL_IO_CMD 



[ Upstream commit 9b382768135ee3ff282f828c906574a8478e036b ]

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().

Fixes: 63263d60 ("nvme: Use metadata for passthrough commands")
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
Reviewed-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0ee10658

drivers/nvme/host/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1016,7 +1016,7 @@ static int nvme_user_cmd(struct nvme_ctrl *ctrl, struct nvme_ns *ns, 


	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);

	if (status >= 0) {

		if (put_user(cmd.result, &ucmd->result))