From patchwork Thu May 10 12:05:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Pattan, Reshma" X-Patchwork-Id: 39738 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BF5BE1BA99; Thu, 10 May 2018 14:05:51 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 7DFBA1B85E; Thu, 10 May 2018 14:05:49 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 May 2018 05:05:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,385,1520924400"; d="scan'208";a="54016340" Received: from sivswdev02.ir.intel.com (HELO localhost.localdomain) ([10.237.217.46]) by fmsmga001.fm.intel.com with ESMTP; 10 May 2018 05:05:46 -0700 From: Reshma Pattan To: dev@dpdk.org Cc: bruce.richardson@intel.com, stable@dpdk.org, Reshma Pattan Date: Thu, 10 May 2018 13:05:44 +0100 Message-Id: <1525953944-11339-1-git-send-email-reshma.pattan@intel.com> X-Mailer: git-send-email 1.7.0.7 In-Reply-To: <1525865729-16086-3-git-send-email-reshma.pattan@intel.com> References: <1525865729-16086-3-git-send-email-reshma.pattan@intel.com> Subject: [dpdk-dev] [PATCH v2] examples/vhost_scsi: replace strncpy with strlcpy X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use strlcpy instead of strncpy. Fixes: db75c7af19 ("examples/vhost_scsi: introduce a new sample app") CC: stable@dpdk.org Signed-off-by: Reshma Pattan Acked-by: Bruce Richardson --- v2: replace magic numbers with sizeof() wherever possible. --- examples/vhost_scsi/scsi.c | 14 +++++++++----- examples/vhost_scsi/scsi_spec.h | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/examples/vhost_scsi/scsi.c b/examples/vhost_scsi/scsi.c index 2a034bb9b..0c2fa3e6a 100644 --- a/examples/vhost_scsi/scsi.c +++ b/examples/vhost_scsi/scsi.c @@ -20,6 +20,7 @@ #include #include #include +#include #include "vhost_scsi.h" #include "scsi_spec.h" @@ -181,7 +182,8 @@ vhost_bdev_scsi_inquiry_command(struct vhost_block_dev *bdev, break; case SPC_VPD_UNIT_SERIAL_NUMBER: hlen = 4; - strncpy((char *)vpage->params, bdev->name, 32); + strlcpy((char *)vpage->params, bdev->name, + sizeof(vpage->params)); vpage->alloc_len = rte_cpu_to_be_16(32); break; case SPC_VPD_DEVICE_IDENTIFICATION: @@ -215,10 +217,10 @@ vhost_bdev_scsi_inquiry_command(struct vhost_block_dev *bdev, desig->piv = 1; desig->reserved1 = 0; desig->len = 8 + 16 + 32; - strncpy((char *)desig->desig, "INTEL", 8); + strlcpy((char *)desig->desig, "INTEL", 8); vhost_strcpy_pad((char *)&desig->desig[8], bdev->product_name, 16, ' '); - strncpy((char *)&desig->desig[24], bdev->name, 32); + strlcpy((char *)&desig->desig[24], bdev->name, 32); len += sizeof(struct scsi_desig_desc) + 8 + 16 + 32; buf += sizeof(struct scsi_desig_desc) + desig->len; @@ -275,7 +277,8 @@ vhost_bdev_scsi_inquiry_command(struct vhost_block_dev *bdev, inqdata->flags3 = 0x2; /* T10 VENDOR IDENTIFICATION */ - strncpy((char *)inqdata->t10_vendor_id, "INTEL", 8); + strlcpy((char *)inqdata->t10_vendor_id, "INTEL", + sizeof(inqdata->t10_vendor_id)); /* PRODUCT IDENTIFICATION */ snprintf((char *)inqdata->product_id, @@ -283,7 +286,8 @@ vhost_bdev_scsi_inquiry_command(struct vhost_block_dev *bdev, bdev->product_name); /* PRODUCT REVISION LEVEL */ - strncpy((char *)inqdata->product_rev, "0001", 4); + strlcpy((char *)inqdata->product_rev, "0001", + sizeof(inqdata->product_rev)); /* Standard inquiry data ends here. Only populate * remaining fields if alloc_len indicates enough diff --git a/examples/vhost_scsi/scsi_spec.h b/examples/vhost_scsi/scsi_spec.h index 5c7a894bd..27be02688 100644 --- a/examples/vhost_scsi/scsi_spec.h +++ b/examples/vhost_scsi/scsi_spec.h @@ -367,7 +367,7 @@ struct scsi_vpd_page { uint8_t peripheral; uint8_t page_code; uint16_t alloc_len; - uint8_t params[]; + uint8_t params[32]; }; #define SCSI_VEXT_REF_CHK 0x01