diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-01-03 16:56:55 +0100 |
|---|---|---|
| committer | Keith Busch <kbusch@kernel.org> | 2024-01-05 13:16:18 -0800 |
| commit | 4ee7ffeb4ce50c80bc4504db6f39b25a2df6bcf4 (patch) | |
| tree | 26ef0f21721a32dac464f73644afb7dd8947c7dd /drivers/nvme | |
| parent | bafd590910d00327decb3937e77f6f11c3e80e4b (diff) | |
| download | linux-4ee7ffeb4ce50c80bc4504db6f39b25a2df6bcf4.tar.gz | |
nvmet: re-fix tracing strncpy() warning
An earlier patch had tried to address a warning about a string copy with
missing zero termination:
drivers/nvme/target/trace.h:52:3: warning: ‘strncpy’ specified bound 32 equals destination size [-Wstringop-truncation]
The new version causes a different warning with some compiler versions, notably
gcc-9 and gcc-10, and also misses the zero padding that was apparently done
intentionally in the original code:
drivers/nvme/target/trace.h:56:2: error: 'strncpy' specified bound depends on the length of the source argument [-Werror=stringop-overflow=]
Change it to use strscpy_pad() with the original length, which will give
a properly padded and zero-terminated string as well as avoiding the warning.
Fixes: d86481e924a7 ("nvmet: use min of device_path and disk len")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/target/trace.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/nvme/target/trace.h b/drivers/nvme/target/trace.h index 2f15070ddc569..89020018a0e35 100644 --- a/drivers/nvme/target/trace.h +++ b/drivers/nvme/target/trace.h @@ -59,8 +59,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 |