OSDN Git Service

nvme-trace: fix cdw10 buffer overrun
authorKeith Busch <keith.busch@intel.com>
Wed, 13 Mar 2019 17:54:56 +0000 (18:54 +0100)
committerJens Axboe <axboe@kernel.dk>
Wed, 13 Mar 2019 18:05:39 +0000 (12:05 -0600)
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@intel.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/nvme/host/trace.h

index 244d7c1..97d3c77 100644 (file)
@@ -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),