nvme: disallow passthru cmd from targeting a nsid != nsid of the block dev
PATCH v3 1/1 nvme: disallow passthru cmd from targeting a nsid != nsid of the block dev
From: Niklas Cassel <[email protected]>
When a passthru command targets a specific namespace, the ns parameter to nvme_user_cmd()/nvme_user_cmd64() is set. However, there is currently no validation that the nsid specified in the passthru command targets the namespace/nsid represented by the block device that the ioctl was performed on.
Add a check that validates that the nsid in the passthru command matches that of the supplied namespace.
---
Changes since v2:
-Picked up Reviewed-by-tags.
-Send from a mail server that doesn't mangle the mail.
drivers/nvme/host/core.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/nvme/host/core.c +12 -0
@@ -1599,6 +1599,12 @@ static int nvme_user_cmd(struct nvme_ctrl *ctrl, struct nvme_ns *ns,return -EFAULT ;if (cmd.flags)return -EINVAL ; +if (ns && cmd.nsid != ns->head->ns_id) { +dev_err (ctrl->device, +"%s: nsid (%u) in cmd does not match nsid (%u) of namespace\n" , + current->comm, cmd.nsid, ns->head->ns_id); +return -EINVAL ; + }memset (&c,0 ,sizeof (c)); c.common.opcode = cmd.opcode;
@@ -1643,6 +1649,12 @@ static int nvme_user_cmd64(struct nvme_ctrl *ctrl, struct nvme_ns *ns,return -EFAULT ;if (cmd.flags)return -EINVAL ; +if (ns && cmd.nsid != ns->head->ns_id) { +dev_err (ctrl->device, +"%s: nsid (%u) in cmd does not match nsid (%u) of namespace\n" , + current->comm, cmd.nsid, ns->head->ns_id); +return -EINVAL ; + }memset (&c,0 ,sizeof (c)); c.common.opcode = cmd.opcode;
Signature · 7 lines
2.30.2 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Christoph Hellwig
maintainerSo it turns out that while git-am complained it did apply the patch just fine and it didn't look whitespace mangled. No idea what went on there, but the patch is in nvme-5.13 now.