Commit a8817cc0 authored by Wolfram Sang's avatar Wolfram Sang Committed by Christoph Hellwig
Browse files

nvme: move from strlcpy with unused retval to strscpy 

Follow the advice of the below link and prefer 'strscpy' in this
subsystem. Conversion is 1:1 because the return value is not used.
Generated by a coccinelle script.

Link: https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@mail.gmail.com/


Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 1abc6961

drivers/nvme/host/core.c

+1 −1
Original line number Diff line number Diff line
@@ -2696,7 +2696,7 @@ static void nvme_init_subnqn(struct nvme_subsystem *subsys, struct nvme_ctrl *ct 
	if(!(ctrl->quirks & NVME_QUIRK_IGNORE_DEV_SUBNQN)) {

		nqnlen = strnlen(id->subnqn, NVMF_NQN_SIZE);

		if (nqnlen > 0 && nqnlen < NVMF_NQN_SIZE) {

			strlcpy(subsys->subnqn, id->subnqn, NVMF_NQN_SIZE);

			strscpy(subsys->subnqn, id->subnqn, NVMF_NQN_SIZE);

			return;

		}

drivers/nvme/host/fabrics.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static struct nvmf_host *nvmf_host_add(const char *hostnqn) 
		goto out_unlock;



	kref_init(&host->ref);

	strlcpy(host->nqn, hostnqn, NVMF_NQN_SIZE);

	strscpy(host->nqn, hostnqn, NVMF_NQN_SIZE);



	list_add_tail(&host->list, &nvmf_hosts);

out_unlock:

drivers/nvme/target/admin-cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ static void nvmet_execute_identify_ctrl(struct nvmet_req *req) 
	if (req->port->inline_data_size)

		id->sgls |= cpu_to_le32(1 << 20);



	strlcpy(id->subnqn, ctrl->subsys->subsysnqn, sizeof(id->subnqn));

	strscpy(id->subnqn, ctrl->subsys->subsysnqn, sizeof(id->subnqn));



	/*

	 * Max command capsule size is sqe + in-capsule data size.

drivers/nvme/target/discovery.c

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static void nvmet_execute_disc_identify(struct nvmet_req *req) 


	id->oaes = cpu_to_le32(NVMET_DISC_AEN_CFG_OPTIONAL);



	strlcpy(id->subnqn, ctrl->subsys->subsysnqn, sizeof(id->subnqn));

	strscpy(id->subnqn, ctrl->subsys->subsysnqn, sizeof(id->subnqn));



	status = nvmet_copy_to_sgl(req, 0, id, sizeof(*id));