nvmet: Add helper function 'nvmet_feature_data_len' to calculate the required data_len
Subsystems (2)
PATCH 1/1 nvmet: Add helper function 'nvmet_feature_data_len' to calculate the required data_len
From: Amit Engel <[email protected]>
This fixes a bug in nvmet_execute_get_features, fid 0x81, NVME_FEAT_HOST_ID nvmet_check_data_len shall be called with a valid data_len value
Signed-off-by Amit Engel <[email protected]>
--- drivers/nvme/target/admin-cmd.c | 11 ++++++++++- drivers/nvme/target/nvmet.h | 2 ++ 2 files changed, 12 insertions(+), 1 deletion(-)
drivers/nvme/target/admin-cmd.c +10 -1
@@ -24,6 +24,15 @@ u32 nvmet_get_log_page_len(struct nvme_command *cmd)return len; } +u32 nvmet_feature_data_len (struct nvmet_req *req) +{ +u8 feature = req->cmd->common.cdw10 &0xff ; + +if (feature ==NVME_FEAT_HOST_ID ) +return sizeof (req->sq->ctrl->hostid); +return 0 ; +} +u64 nvmet_get_log_page_offset (struct nvme_command *cmd) {return le64_to_cpu (cmd->get_log_page.lpo);
@@ -778,7 +787,7 @@ static void nvmet_execute_get_features(struct nvmet_req *req)u32 cdw10 =le32_to_cpu (req->cmd->common.cdw10);u16 status =0 ; -if (!nvmet_check_data_len (req,0 )) + if (!nvmet_check_data_len(req, nvmet_feature_data_len(req))return ;switch (cdw10 &0xff ) {
drivers/nvme/target/nvmet.h +2 -0
@@ -434,6 +434,8 @@ u16 nvmet_zero_sgl(struct nvmet_req *req, off_t off, size_t len);u32 nvmet_get_log_page_len (struct nvme_command *cmd);u64 nvmet_get_log_page_offset (struct nvme_command *cmd); +u32 nvmet_feature_data_len (struct nvmet_req *req); +extern struct list_head *nvmet_ports;void nvmet_port_disc_changed (struct nvmet_port *port,struct nvmet_subsys *subsys);
Signature · 7 lines
2.16.5 _______________________________________________ linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme