]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
bnx2x: use strlcpy() to copy a string
authorDan Carpenter <dan.carpenter@oracle.com>
Tue, 2 Oct 2012 01:47:46 +0000 (01:47 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 3 Oct 2012 02:41:17 +0000 (22:41 -0400)
DRV_MODULE_VERSION is smaller than the ->version buffer so the memcpy()
copies 1 byte past the end of the string.  It's not super harmful, but
it makes the static checkers complain.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

index f7ed122f40717ee4392041e09e1b2396e640370b..d5648fc666bdf6f663505bbb433abebac08dbd48 100644 (file)
@@ -3052,9 +3052,8 @@ static void bnx2x_drv_info_ether_stat(struct bnx2x *bp)
        struct eth_stats_info *ether_stat =
                &bp->slowpath->drv_info_to_mcp.ether_stat;
 
-       /* leave last char as NULL */
-       memcpy(ether_stat->version, DRV_MODULE_VERSION,
-              ETH_STAT_INFO_VERSION_LEN - 1);
+       strlcpy(ether_stat->version, DRV_MODULE_VERSION,
+               ETH_STAT_INFO_VERSION_LEN);
 
        bp->sp_objs[0].mac_obj.get_n_elements(bp, &bp->sp_objs[0].mac_obj,
                                        DRV_INFO_ETH_STAT_NUM_MACS_REQUIRED,