Merge tag 'hardening-v6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...

[linux.git] / drivers / nvme / host / fc.c

diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
index 1d51925ea67fd166413cd38a8ce2ffd9ce060175..043f2d7798c1150f255c975524338dceea1cb7d1 100644 (file)
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@ -1218,10 +1218,10 @@ nvme_fc_connect_admin_queue(struct nvme_fc_ctrl *ctrl,
        /* Linux supports only Dynamic controllers */
        assoc_rqst->assoc_cmd.cntlid = cpu_to_be16(0xffff);
        uuid_copy(&assoc_rqst->assoc_cmd.hostid, &ctrl->ctrl.opts->host->id);
-       strncpy(assoc_rqst->assoc_cmd.hostnqn, ctrl->ctrl.opts->host->nqn,
-               min(FCNVME_ASSOC_HOSTNQN_LEN, NVMF_NQN_SIZE));
-       strncpy(assoc_rqst->assoc_cmd.subnqn, ctrl->ctrl.opts->subsysnqn,
-               min(FCNVME_ASSOC_SUBNQN_LEN, NVMF_NQN_SIZE));
+       strscpy(assoc_rqst->assoc_cmd.hostnqn, ctrl->ctrl.opts->host->nqn,
+               sizeof(assoc_rqst->assoc_cmd.hostnqn));
+       strscpy(assoc_rqst->assoc_cmd.subnqn, ctrl->ctrl.opts->subsysnqn,
+               sizeof(assoc_rqst->assoc_cmd.subnqn));
 
        lsop->queue = queue;
        lsreq->rqstaddr = assoc_rqst;