]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
net: stmmac: ensure jumbo_frm error return is correctly checked for -ve value
authorColin Ian King <colin.king@canonical.com>
Mon, 5 Jun 2017 09:04:52 +0000 (10:04 +0100)
committerDavid S. Miller <davem@davemloft.net>
Tue, 6 Jun 2017 19:13:46 +0000 (15:13 -0400)
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>
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

index a74c481401c46ee659b1244b0124966cabeafdbd..e5515c521d86678feb8728367497744b5a9b1e05 100644 (file)
@@ -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;