summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorColin Ian King2017-06-05 11:04:52 +0200
committerDavid S. Miller2017-06-06 21:13:46 +0200
commit594238158bf748c285f0a73222cd9b7ccf3c525d (patch)
tree0fc2e20e8b26f80277c1914f929e5e3ee63746e9 /drivers/net
parentMerge tag 'wireless-drivers-for-davem-2017-06-06' of git://git.kernel.org/pub... (diff)
downloadkernel-qcow2-linux-594238158bf748c285f0a73222cd9b7ccf3c525d.tar.gz
kernel-qcow2-linux-594238158bf748c285f0a73222cd9b7ccf3c525d.tar.xz
kernel-qcow2-linux-594238158bf748c285f0a73222cd9b7ccf3c525d.zip
net: stmmac: ensure jumbo_frm error return is correctly checked for -ve value
The current comparison of entry < 0 will never be true since entry is an unsigned integer. Make entry an int to ensure -ve error return values from the call to jumbo_frm are correctly being caught. Detected by CoverityScan, CID#1238760 ("Macro compares unsigned to 0") Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/stmmac_main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index a74c481401c4..e5515c521d86 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -2947,7 +2947,8 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
int i, csum_insertion = 0, is_jumbo = 0;
u32 queue = skb_get_queue_mapping(skb);
int nfrags = skb_shinfo(skb)->nr_frags;
- unsigned int entry, first_entry;
+ int entry;
+ unsigned int first_entry;
struct dma_desc *desc, *first;
struct stmmac_tx_queue *tx_q;
unsigned int enh_desc;