Skip to contentSkip to conversation

nvme/trace: Fix cdw10 buffer overrun

PATCH New Keith Busch 3 participants 3 messages Mar 6, 2019 – Mar 8, 2019 NVMe

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nvme/trace: Fix cdw10 buffer overrun

The field is defined to be a 24 byte array, we don't need to multiply the sizeof() that field by the number of dwords it covers.

Signed-off-by Keith Busch <keith.busch at intel.com>
---
 drivers/nvme/host/trace.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/host/trace.h +1 -1
index 244d7c177e5a..97d3c77365b8 100644
@@ -108,7 +108,7 @@ TRACE_EVENT(nvme_setup_cmd,
 		__entry->metadata = le64_to_cpu(cmd->common.metadata);
 		__assign_disk_name(__entry->disk, req->rq_disk);
 		memcpy(__entry->cdw10, &cmd->common.cdw10,
-			6 * sizeof(__entry->cdw10));
+			sizeof(__entry->cdw10));
 	    ),
 	    TP_printk("nvme%d: %sqid=%d, cmdid=%u, nsid=%u, flags=0x%x, meta=0x%llx, cmd=(%s %s)",
 		      __entry->ctrl_id, __print_disk_name(__entry->disk),
Signature · 1 line
2.14.4
maintainer
#1 lore raw

PATCH 1/1 nvme/trace: Fix cdw10 buffer overrun

Reviewed-by Sagi Grimberg <sagi at grimberg.me>