lkml.org 
[lkml]   [2019]   [Feb]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.20 27/92] nvme: pad fake subsys NQN vid and ssvid with zeros
    Date
    4.20-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ 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 <keith.busch@intel.com>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 962012135b62..971ca6754959 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


    \
     
     \ /
      Last update: 2019-02-18 15:47    [W:7.583 / U:0.556 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site