diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-01-03 16:56:56 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-01-25 15:35:55 -0800 |
| commit | 79e9dfd7f89a362d9a987b9aff10d3899de7ab23 (patch) | |
| tree | 610228e16a0d442303a92f418ff3ccc42284ed4d | |
| parent | 4652eb8176235351a650285f198fab647132ffc6 (diff) | |
| download | linux-rpi-79e9dfd7f89a362d9a987b9aff10d3899de7ab23.tar.gz linux-rpi-79e9dfd7f89a362d9a987b9aff10d3899de7ab23.tar.bz2 linux-rpi-79e9dfd7f89a362d9a987b9aff10d3899de7ab23.zip | |
nvme: trace: avoid memcpy overflow warning
[ Upstream commit a7de1dea76cd6a3707707af4ea2f8bc3cdeaeb11 ]
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: 5c629dc9609dc ("nvme: use struct group for generic command dwords")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/nvme/target/trace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/target/trace.h b/drivers/nvme/target/trace.h index 155334ddc13f..974d99d47f51 100644 --- a/drivers/nvme/target/trace.h +++ b/drivers/nvme/target/trace.h @@ -84,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, " |