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

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: d86481e9 ("nvmet: use min of device_path and disk len")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent bafd5909

drivers/nvme/target/trace.h

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