[PATCH 1/2] nvmet: re-fix tracing strncpy() warning

Arnd Bergmann arnd at arndb.de
Fri Jan 5 12:36:38 PST 2024


On Fri, Jan 5, 2024, at 21:24, Keith Busch wrote:
> On Wed, Jan 03, 2024 at 04:56:55PM +0100, Arnd Bergmann wrote:
>> @@ -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);
>>  }
>
> I like this one, however Daniel has a different fix for this already
> staged in nvme-6.8:
>
>  
> https://git.infradead.org/nvme.git/commitdiff/8f6c0eec5fad13785fd53a5b3b5f8b97b722a2a3

+       snprintf(name,
+                min_t(size_t, DISK_NAME_LEN, strlen(req->ns->device_path) + 1),
+                "%s", req->ns->device_path);

Don't we still need the zero-padding here to avoid leaking
kernel data to userspace?

    Arnd



More information about the Linux-nvme mailing list