From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752001AbdKHJ7U (ORCPT ); Wed, 8 Nov 2017 04:59:20 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:48289 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751674AbdKHJ7S (ORCPT ); Wed, 8 Nov 2017 04:59:18 -0500 X-Google-Smtp-Source: ABhQp+Q0vpSsuXpHC+hmxRB51ruWjbRLEVZ5Va5h42BR95v3dEOO6zonoyQ7kPnizsXNtxAtkOk+yw== From: "=?UTF-8?q?Javier=20Gonz=C3=A1lez?=" X-Google-Original-From: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= To: hch@lst.de, sagi@grimberg.me, keith.busch@intel.com, joe@perches.com Cc: linux-nvme@lists.infradead.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Javier=20Gonz=C3=A1lez?= , =?UTF-8?q?Javier=20Gonz=C3=A1lez?= Subject: [PATCH v2] nvme: compare NQN string with right size Date: Wed, 8 Nov 2017 10:59:03 +0100 Message-Id: <1510135144-1557-1-git-send-email-javier@cnexlabs.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Javier González Copy subnqns using NVMF_NQN_SIZE as it is < 256 Changes since V1: - Fix commit message to indicate that it is a copy and not a comparison. Signed-off-by: Javier González Reviewed-by: Christoph Hellwig --- 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 37f9039bb9ca..b3bc9fb39a6c 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -1744,7 +1744,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; } -- 2.7.4