RDMA/ocrdma: Suppress a compiler warning
authorBart Van Assche <bart.vanassche@wdc.com>
Wed, 18 Jul 2018 16:01:35 +0000 (09:01 -0700)
committerJason Gunthorpe <jgg@mellanox.com>
Wed, 25 Jul 2018 20:35:11 +0000 (14:35 -0600)
This patch avoids that the following compiler warning is reported when
building with gcc 8 and W=1:

In function 'ocrdma_mbx_get_ctrl_attribs',
    inlined from 'ocrdma_init_hw' at drivers/infiniband/hw/ocrdma/ocrdma_hw.c:3224:11:
drivers/infiniband/hw/ocrdma/ocrdma_hw.c:1368:3: warning: 'strncpy' output may be truncated copying 31 bytes from a string of length 31 [-Wstringop-truncation]
   strncpy(dev->model_number,
   ^~~~~~~~~~~~~~~~~~~~~~~~~~
    hba_attribs->controller_model_number, 31);
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Acked-by: Selvin Xavier <selvin.xavier@broadcom.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
drivers/infiniband/hw/ocrdma/ocrdma_hw.c

index c6c87cb..e578281 100644 (file)
@@ -1365,8 +1365,9 @@ static int ocrdma_mbx_get_ctrl_attribs(struct ocrdma_dev *dev)
                dev->hba_port_num = (hba_attribs->ptpnum_maxdoms_hbast_cv &
                                        OCRDMA_HBA_ATTRB_PTNUM_MASK)
                                        >> OCRDMA_HBA_ATTRB_PTNUM_SHIFT;
-               strncpy(dev->model_number,
-                       hba_attribs->controller_model_number, 31);
+               strlcpy(dev->model_number,
+                       hba_attribs->controller_model_number,
+                       sizeof(dev->model_number));
        }
        dma_free_coherent(&dev->nic_info.pdev->dev, dma.size, dma.va, dma.pa);
 free_mqe: