On Wed, May 09, 2018 at 12:35:29PM +0100, Reshma Pattan wrote:
> Use strlcpy instead of strncpy.
>
> Fixes: db75c7af19 ("examples/vhost_scsi: introduce a new sample app")
> CC: sta...@dpdk.org
>
> Signed-off-by: Reshma Pattan <reshma.pat...@intel.com>
> ---
> examples/vhost_scsi/scsi.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/examples/vhost_scsi/scsi.c b/examples/vhost_scsi/scsi.c
> index 2a034bb9b..dd5be3c7e 100644
> --- a/examples/vhost_scsi/scsi.c
> +++ b/examples/vhost_scsi/scsi.c
> @@ -20,6 +20,7 @@
> #include <rte_log.h>
> #include <rte_malloc.h>
> #include <rte_byteorder.h>
> +#include <rte_string_fns.h>
>
> #include "vhost_scsi.h"
> #include "scsi_spec.h"
> @@ -181,7 +182,7 @@ 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, 32);
> vpage->alloc_len = rte_cpu_to_be_16(32);
> break;
> case SPC_VPD_DEVICE_IDENTIFICATION:
> @@ -215,10 +216,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 +276,7 @@ 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", 8);
>
> /* PRODUCT IDENTIFICATION */
> snprintf((char *)inqdata->product_id,
> @@ -283,7 +284,7 @@ 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", 4);
>
> /* Standard inquiry data ends here. Only populate
> * remaining fields if alloc_len indicates enough
> --
Can the magic numbers "32", "8", "4" be replaced with non-magic values,
e.g. sizeof(...).
/Bruce
