Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c4eb2a5 authored by Martin Wilck's avatar Martin Wilck Committed by Greg Kroah-Hartman
Browse files

nvmet: don't overwrite identify sn/fr with 0-bytes 



commit 42819eb7a0957cc340ad4ed8bba736bab5ebc464 upstream.

The merged version of my patch "nvmet: don't report 0-bytes in serial
number" fails to remove two lines which should have been replaced,
so that the space-padded strings are overwritten again with 0-bytes.
Fix it.

Fixes: 42de82a8b544 nvmet: don't report 0-bytes in serial number
Signed-off-by: default avatarMartin Wilck <mwilck@suse.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimbeg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f43d8e4c

drivers/nvme/target/admin-cmd.c

+0 −6
Original line number Diff line number Diff line
@@ -197,12 +197,6 @@ static void nvmet_execute_identify_ctrl(struct nvmet_req *req) 
	copy_and_pad(id->mn, sizeof(id->mn), model, sizeof(model) - 1);

	copy_and_pad(id->fr, sizeof(id->fr), UTS_RELEASE, strlen(UTS_RELEASE));



	memset(id->mn, ' ', sizeof(id->mn));

	strncpy((char *)id->mn, "Linux", sizeof(id->mn));



	memset(id->fr, ' ', sizeof(id->fr));

	strncpy((char *)id->fr, UTS_RELEASE, sizeof(id->fr));



	id->rab = 6;



	/*