From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB1FBC282C4 for ; Sat, 9 Feb 2019 18:54:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 912D720823 for ; Sat, 9 Feb 2019 18:54:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549738444; bh=Vft07bYuclxmkMHY8imfxHe7D6BSLdZ2pcepE+dXe+c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gzBlk3W9rev7Reps+SuW6++9Yz25PXZwR51XVelUf2iQNxM3EI3dhZsRAEoCG95rT BsrfAdA14p54CBCGeGmX6cvZqkY2Mq7rgT0AjegOKyAVW9pYz15PCo1y7lTd4kqu/r GQTffq1LN/KmlYkFefXF0VyEQyozyoi2nc0pPII0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727854AbfBISyD (ORCPT ); Sat, 9 Feb 2019 13:54:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:34418 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727997AbfBIStJ (ORCPT ); Sat, 9 Feb 2019 13:49:09 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 909C52192D; Sat, 9 Feb 2019 18:49:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549738149; bh=Vft07bYuclxmkMHY8imfxHe7D6BSLdZ2pcepE+dXe+c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LS/udS4+ZEM+5bzENgoCM2nPufW1IFFfxaAIhdIuiy5cyqX0JBwDNFbdNJH/Euy+/ GP65R827XWeSmQX8cpE80w8mSC1fmhTSWQOXqaApMCLW4txrYhfL+jTL1mjEyjXw8W glfpovGoXVW1RDWFH3mniKiZDrBJ0YweOvps9gPI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Keith Busch , Christoph Hellwig , Sasha Levin , linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 4.19 17/28] nvme: pad fake subsys NQN vid and ssvid with zeros Date: Sat, 9 Feb 2019 13:48:25 -0500 Message-Id: <20190209184840.126418-17-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190209184840.126418-1-sashal@kernel.org> References: <20190209184840.126418-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Keith Busch [ Upstream commit 3da584f57133e51aeb84aaefae5e3d69531a1e4f ] We need to preserve the leading zeros in the vid and ssvid when generating a unique NQN. Truncating these may lead to naming collisions. Signed-off-by: Keith Busch Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin --- 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 e5bddae16ed4..e0d2b7473901 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2095,7 +2095,7 @@ static void nvme_init_subnqn(struct nvme_subsystem *subsys, struct nvme_ctrl *ct /* Generate a "fake" NQN per Figure 254 in NVMe 1.3 + ECN 001 */ off = snprintf(subsys->subnqn, NVMF_NQN_SIZE, - "nqn.2014.08.org.nvmexpress:%4x%4x", + "nqn.2014.08.org.nvmexpress:%04x%04x", le16_to_cpu(id->vid), le16_to_cpu(id->ssvid)); memcpy(subsys->subnqn + off, id->sn, sizeof(id->sn)); off += sizeof(id->sn); -- 2.19.1