]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
net: bgmac: Fix endian access in bgmac_dma_tx_ring_free()
authorFlorian Fainelli <f.fainelli@gmail.com>
Sun, 1 Apr 2018 17:26:30 +0000 (10:26 -0700)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Mon, 27 Aug 2018 14:40:05 +0000 (16:40 +0200)
BugLink: http://bugs.launchpad.net/bugs/1786352
[ Upstream commit 60d6e6f0b9e422dd01aeda39257ee0428e5e2a3f ]

bgmac_dma_tx_ring_free() assigns the ctl1 word which is a litle endian
32-bit word without using proper accessors, fix this, and because a
length cannot be negative, use unsigned int while at it.

Fixes: 9cde94506eac ("bgmac: implement scatter/gather support")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/net/ethernet/broadcom/bgmac.c

index 1d96cd594adea6ca63ee71c6e521224fcec2cdde..7eb3f542ae20c437f9f6fe791542bc78effae2ec 100644 (file)
@@ -548,7 +548,8 @@ static void bgmac_dma_tx_ring_free(struct bgmac *bgmac,
        int i;
 
        for (i = 0; i < BGMAC_TX_RING_SLOTS; i++) {
-               int len = dma_desc[i].ctl1 & BGMAC_DESC_CTL1_LEN;
+               u32 ctl1 = le32_to_cpu(dma_desc[i].ctl1);
+               unsigned int len = ctl1 & BGMAC_DESC_CTL1_LEN;
 
                slot = &ring->slots[i];
                dev_kfree_skb(slot->skb);