Commit a7de1dea authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Keith Busch
Browse files

nvme: trace: avoid memcpy overflow warning 



A previous patch introduced a struct_group() in nvme_common_command to help
stringop fortification figure out the length of the fields, but one function
is not currently using them:

In file included from drivers/nvme/target/core.c:7:
In file included from include/linux/string.h:254:
include/linux/fortify-string.h:592:4: error: call to '__read_overflow2_field' declared with 'warning' attribute: detected read beyond size of field (2nd parameter); maybe use struct_group()? [-Werror,-Wattribute-warning]
                        __read_overflow2_field(q_size_field, size);
                        ^

Change this one to use the correct field name to avoid the warning.

Fixes: 5c629dc9 ("nvme: use struct group for generic command dwords")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent 4ee7ffeb

drivers/nvme/target/trace.h

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,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, "