| Message ID | 1509703370-20379-3-git-send-email-javier@cnexlabs.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Nov 03, 2017 at 11:02:49AM +0100, Javier González wrote: > Compare subnqns using NVMF_NQN_SIZE as it is < 256 > > Signed-off-by: Javier González <javier@cnexlabs.com> > --- > drivers/nvme/host/core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c > index bd1d5ff911c9..ae8ab0a1ef0d 100644 > --- a/drivers/nvme/host/core.c > +++ b/drivers/nvme/host/core.c > @@ -1743,7 +1743,7 @@ static void nvme_init_subnqn(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) > > nqnlen = strnlen(id->subnqn, NVMF_NQN_SIZE); > if (nqnlen > 0 && nqnlen < NVMF_NQN_SIZE) { > - strcpy(ctrl->subnqn, id->subnqn); > + strncpy(ctrl->subnqn, id->subnqn, NVMF_NQN_SIZE); > return; > } This isn't a compare, but a copy. Except for that it looks ok to me.
> On 3 Nov 2017, at 13.54, Christoph Hellwig <hch@lst.de> wrote: > > On Fri, Nov 03, 2017 at 11:02:49AM +0100, Javier González wrote: >> Compare subnqns using NVMF_NQN_SIZE as it is < 256 >> >> Signed-off-by: Javier González <javier@cnexlabs.com> >> --- >> drivers/nvme/host/core.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c >> index bd1d5ff911c9..ae8ab0a1ef0d 100644 >> --- a/drivers/nvme/host/core.c >> +++ b/drivers/nvme/host/core.c >> @@ -1743,7 +1743,7 @@ static void nvme_init_subnqn(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) >> >> nqnlen = strnlen(id->subnqn, NVMF_NQN_SIZE); >> if (nqnlen > 0 && nqnlen < NVMF_NQN_SIZE) { >> - strcpy(ctrl->subnqn, id->subnqn); >> + strncpy(ctrl->subnqn, id->subnqn, NVMF_NQN_SIZE); >> return; >> } > > This isn't a compare, but a copy. Except for that it looks ok to me. True. Can you change the message when picking it up?
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index bd1d5ff911c9..ae8ab0a1ef0d 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -1743,7 +1743,7 @@ static void nvme_init_subnqn(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) nqnlen = strnlen(id->subnqn, NVMF_NQN_SIZE); if (nqnlen > 0 && nqnlen < NVMF_NQN_SIZE) { - strcpy(ctrl->subnqn, id->subnqn); + strncpy(ctrl->subnqn, id->subnqn, NVMF_NQN_SIZE); return; }
Compare subnqns using NVMF_NQN_SIZE as it is < 256 Signed-off-by: Javier González <javier@cnexlabs.com> --- drivers/nvme/host/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)