hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

enic: Fix format truncation warning 

With -Wformat-truncation, gcc throws the following warning.

Fix this by increasing the size of devname to accommodate 15 character
netdev interface name and description.

Remove length format precision for %s. We can fit entire name.

Also increment the version.

drivers/net/ethernet/cisco/enic/enic_main.c: In function ‘enic_open’:
drivers/net/ethernet/cisco/enic/enic_main.c:1740:15: warning: ‘%u’ directive output may be truncated writing between 1 and 2 bytes into a region of size between 1 and 12 [-Wformat-truncation=]
     "%.11s-rx-%u", netdev->name, i);
               ^~
drivers/net/ethernet/cisco/enic/enic_main.c:1740:5: note: directive argument in the range [0, 16]
     "%.11s-rx-%u", netdev->name, i);
     ^~~~~~~~~~~~~
drivers/net/ethernet/cisco/enic/enic_main.c:1738:4: note: ‘snprintf’ output between 6 and 18 bytes into a destination of size 16
    snprintf(enic->msix[intr].devname,
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     sizeof(enic->msix[intr].devname),
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     "%.11s-rx-%u", netdev->name, i);
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Govindarajulu Varadarajan <gvaradar@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Govindarajulu Varadarajan 2017-06-19 16:28:44 -07:00 committed by David S. Miller
parent 9edfa7dab8
commit 7044f429e7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/cisco/enic/enic.h
View File

@ -33,7 +33,7 @@
#define DRV_NAME "enic" #define DRV_NAME "enic"
#define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver" #define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver"
#define DRV_VERSION "2.3.0.31" #define DRV_VERSION "2.3.0.42"
#define DRV_COPYRIGHT "Copyright 2008-2013 Cisco Systems, Inc" #define DRV_COPYRIGHT "Copyright 2008-2013 Cisco Systems, Inc"
#define ENIC_BARS_MAX 6 #define ENIC_BARS_MAX 6
@ -47,7 +47,7 @@
struct enic_msix_entry { struct enic_msix_entry {
int requested; int requested;
char devname[IFNAMSIZ]; char devname[IFNAMSIZ + 8];
irqreturn_t (*isr)(int, void *); irqreturn_t (*isr)(int, void *);
void *devid; void *devid;
cpumask_var_t affinity_mask; cpumask_var_t affinity_mask;

8
drivers/net/ethernet/cisco/enic/enic_main.c
View File

@ -1737,7 +1737,7 @@ static int enic_request_intr(struct enic *enic)
intr = enic_msix_rq_intr(enic, i); intr = enic_msix_rq_intr(enic, i);
snprintf(enic->msix[intr].devname, snprintf(enic->msix[intr].devname,
sizeof(enic->msix[intr].devname), sizeof(enic->msix[intr].devname),
"%.11s-rx-%u", netdev->name, i); "%s-rx-%u", netdev->name, i);
enic->msix[intr].isr = enic_isr_msix; enic->msix[intr].isr = enic_isr_msix;
enic->msix[intr].devid = &enic->napi[i]; enic->msix[intr].devid = &enic->napi[i];
} }
@ -1748,7 +1748,7 @@ static int enic_request_intr(struct enic *enic)
intr = enic_msix_wq_intr(enic, i); intr = enic_msix_wq_intr(enic, i);
snprintf(enic->msix[intr].devname, snprintf(enic->msix[intr].devname,
sizeof(enic->msix[intr].devname), sizeof(enic->msix[intr].devname),
"%.11s-tx-%u", netdev->name, i); "%s-tx-%u", netdev->name, i);
enic->msix[intr].isr = enic_isr_msix; enic->msix[intr].isr = enic_isr_msix;
enic->msix[intr].devid = &enic->napi[wq]; enic->msix[intr].devid = &enic->napi[wq];
} }
@ -1756,14 +1756,14 @@ static int enic_request_intr(struct enic *enic)
intr = enic_msix_err_intr(enic); intr = enic_msix_err_intr(enic);
snprintf(enic->msix[intr].devname, snprintf(enic->msix[intr].devname,
sizeof(enic->msix[intr].devname), sizeof(enic->msix[intr].devname),
"%.11s-err", netdev->name); "%s-err", netdev->name);
enic->msix[intr].isr = enic_isr_msix_err; enic->msix[intr].isr = enic_isr_msix_err;
enic->msix[intr].devid = enic; enic->msix[intr].devid = enic;
intr = enic_msix_notify_intr(enic); intr = enic_msix_notify_intr(enic);
snprintf(enic->msix[intr].devname, snprintf(enic->msix[intr].devname,
sizeof(enic->msix[intr].devname), sizeof(enic->msix[intr].devname),
"%.11s-notify", netdev->name); "%s-notify", netdev->name);
enic->msix[intr].isr = enic_isr_msix_notify; enic->msix[intr].isr = enic_isr_msix_notify;
enic->msix[intr].devid = enic; enic->msix[intr].devid = enic;