nvme: trace: avoid memcpy overflow warning

[platform/kernel/linux-starfive.git] / drivers / nvme / target / trace.h

diff --git a/drivers/nvme/target/trace.h b/drivers/nvme/target/trace.h
index 6109b38..974d99d 100644 (file)
--- a/drivers/nvme/target/trace.h
+++ b/drivers/nvme/target/trace.h
@@ -53,8 +53,7 @@ static inline void __assign_req_name(char *name, struct nvmet_req *req)
                return;
        }
 
-       strncpy(name, req->ns->device_path,
-               min_t(size_t, DISK_NAME_LEN, strlen(req->ns->device_path)));
+       strscpy_pad(name, req->ns->device_path, DISK_NAME_LEN);
 }
 #endif
 
@@ -85,7 +84,7 @@ TRACE_EVENT(nvmet_req_init,
                __entry->flags = cmd->common.flags;
                __entry->nsid = le32_to_cpu(cmd->common.nsid);
                __entry->metadata = le64_to_cpu(cmd->common.metadata);
-               memcpy(__entry->cdw10, &cmd->common.cdw10,
+               memcpy(__entry->cdw10, &cmd->common.cdws,
                        sizeof(__entry->cdw10));
        ),
        TP_printk("nvmet%s: %sqid=%d, cmdid=%u, nsid=%u, flags=%#x, "