nvme: fix miss command type check
Subsystems (2)
PATCH 1/1 nvme: fix miss command type check
From: "min15.li" <[email protected]>
commit 31a5978243d24d77be4bacca56c78a0fbc43b00d upstream.
In the function nvme_passthru_end(), only the value of the command opcode is checked, without checking the command type (IO command or Admin command). When we send a Dataset Management command (The opcode of the Dataset Management command is the same as the Set Feature command), kernel thinks it is a set feature command, then sets the controller's keep alive interval, and calls nvme_keep_alive_work().
--- drivers/nvme/host/core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/nvme/host/core.c +4 -2
@@ -1185,7 +1185,7 @@ static u32 nvme_passthru_start(struct nvme_ctrl *ctrl, struct nvme_ns *ns,return effects; } -static void nvme_passthru_end (struct nvme_ctrl *ctrl,u32 effects, +static void nvme_passthru_end (struct nvme_ctrl *ctrl,struct nvme_ns *ns,u32 effects,struct nvme_command *cmd,int status) {if (effects &NVME_CMD_EFFECTS_CSE_MASK ) {
@@ -1201,6 +1201,8 @@ static void nvme_passthru_end(struct nvme_ctrl *ctrl, u32 effects,nvme_queue_scan (ctrl);flush_work (&ctrl->scan_work); } +if (ns) +return ;switch (cmd->common.opcode) {case nvme_admin_set_features:
@@ -1235,7 +1237,7 @@ int nvme_execute_passthru_rq(struct request *rq) effects =nvme_passthru_start (ctrl, ns, cmd->common.opcode); ret =nvme_execute_rq (disk, rq, false);if (effects)/* nothing to be done for zero cmd effects */ -nvme_passthru_end (ctrl, effects, cmd, ret); +nvme_passthru_end (ctrl, ns, effects, cmd, ret);return ret; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerQuoted 17 lines · Tokunori Ikegami
From: "min15.li" <[email protected]>
commit
31a5978243d24d77be4bacca56c78a0fbc43b00dupstream.In the function
nvme_passthru_end(), only the value of the command opcode is checked, without checking the command type (IO command or Admin command). When we send a Dataset Management command (The opcode of the Dataset Management command is the same as the Set Feature command), kernel thinks it is a set feature command, then sets the controller's keep alive interval, and callsnvme_keep_alive_work().Signed-off-by min15.li <[email protected]>Reviewed-by Kanchan Joshi <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Signed-off-by Keith Busch <[email protected]>Fixes b58da2d270db ("nvme: update keep alive interval when kato is modified")Signed-off-by Tokunori Ikegami <[email protected]>
Quoted 3 lines
--- drivers/nvme/host/core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
Both now queued up, thanks.
greg k-h