From patchwork Mon Nov 19 21:06:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Disseldorp X-Patchwork-Id: 10689459 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1503116B1 for ; Mon, 19 Nov 2018 21:06:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0955D2A4C7 for ; Mon, 19 Nov 2018 21:06:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F1AAF2A550; Mon, 19 Nov 2018 21:06:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B2AA62A4C7 for ; Mon, 19 Nov 2018 21:06:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730966AbeKTHcP (ORCPT ); Tue, 20 Nov 2018 02:32:15 -0500 Received: from mx2.suse.de ([195.135.220.15]:53342 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730954AbeKTHcP (ORCPT ); Tue, 20 Nov 2018 02:32:15 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id DFEE8B06E; Mon, 19 Nov 2018 21:06:46 +0000 (UTC) From: David Disseldorp To: target-devel@vger.kernel.org Cc: hare@suse.com, lduncan@suse.com, cvubrugier@fastmail.fm, Mike Christie , martin.petersen@oracle.com, linux-scsi@vger.kernel.org, David Disseldorp Subject: [PATCH v3 2/4] target: don't assume t10_wwn.vendor is null terminated Date: Mon, 19 Nov 2018 22:06:34 +0100 Message-Id: <20181119210636.22979-3-ddiss@suse.de> X-Mailer: git-send-email 2.13.7 In-Reply-To: <20181119210636.22979-1-ddiss@suse.de> References: <20181119210636.22979-1-ddiss@suse.de> Sender: target-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: target-devel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: David Disseldorp --- drivers/target/target_core_stat.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/target/target_core_stat.c b/drivers/target/target_core_stat.c index f0db91ebd735..89f35167f036 100644 --- a/drivers/target/target_core_stat.c +++ b/drivers/target/target_core_stat.c @@ -804,10 +804,17 @@ static ssize_t target_stat_transport_dev_name_show(struct config_item *item, if (dev) { wwn = &dev->t10_wwn; /* scsiTransportDevName */ - ret = snprintf(page, PAGE_SIZE, "%s+%s\n", + if (strlen(wwn->unit_serial)) { + ret = snprintf(page, PAGE_SIZE, "%s+%s\n", + tpg->se_tpg_tfo->tpg_get_wwn(tpg), + wwn->unit_serial); + } else { + ret = snprintf(page, PAGE_SIZE, "%s+%." + __stringify(INQUIRY_VENDOR_IDENTIFIER_LEN) + "s\n", tpg->se_tpg_tfo->tpg_get_wwn(tpg), - (strlen(wwn->unit_serial)) ? wwn->unit_serial : wwn->vendor); + } } rcu_read_unlock(); return ret;