diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2015-01-25 15:20:39 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2015-01-25 15:20:39 +0000 |
commit | d26694243af236fed09a4b38f3cc68e40ad063b5 (patch) | |
tree | df356ae59718ae0996986ccb61155243098dbc3f /target/linux/generic/patches-3.19/775-bgmac-check-length-of-received-frame.patch | |
parent | a46bb6ec6a0ed6eb56dc2f4551a57e63a7292753 (diff) | |
download | master-31e0f0ae-d26694243af236fed09a4b38f3cc68e40ad063b5.tar.gz master-31e0f0ae-d26694243af236fed09a4b38f3cc68e40ad063b5.tar.bz2 master-31e0f0ae-d26694243af236fed09a4b38f3cc68e40ad063b5.zip |
generic: add preliminary 3.19 support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 44126
Diffstat (limited to 'target/linux/generic/patches-3.19/775-bgmac-check-length-of-received-frame.patch')
-rw-r--r-- | target/linux/generic/patches-3.19/775-bgmac-check-length-of-received-frame.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.19/775-bgmac-check-length-of-received-frame.patch b/target/linux/generic/patches-3.19/775-bgmac-check-length-of-received-frame.patch new file mode 100644 index 0000000000..c3d63b65fa --- /dev/null +++ b/target/linux/generic/patches-3.19/775-bgmac-check-length-of-received-frame.patch @@ -0,0 +1,39 @@ +From 2d12a9abf3f81de5b51852e3cfcba8cedac82642 Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens <hauke@hauke-m.de> +Date: Fri, 6 Dec 2013 01:14:52 +0100 +Subject: [PATCH] bgmac: check length of received frame + +--- + drivers/net/ethernet/broadcom/bgmac.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +--- a/drivers/net/ethernet/broadcom/bgmac.c ++++ b/drivers/net/ethernet/broadcom/bgmac.c +@@ -363,6 +363,27 @@ static int bgmac_dma_rx_read(struct bgma + dma_addr_t old_dma_addr = slot->dma_addr; + int err; + ++ if (len > BGMAC_RX_MAX_FRAME_SIZE) { ++ struct bgmac_dma_desc *dma_desc = ring->cpu_base + ring->start; ++ ++ bgmac_err(bgmac, "Hardware reported invalid packet length %d for slot %d!\n", len, ring->start); ++ bgmac_err(bgmac, "flags: 0x%04X\n", flags); ++ bgmac_err(bgmac, "ctl0: 0x%08X\tctl1: 0x%08X\n", le32_to_cpu(dma_desc->ctl0), le32_to_cpu(dma_desc->ctl1)); ++ ++ bgmac_err(bgmac, " BGMAC_DMA_RX_CTL: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_CTL)); ++ bgmac_err(bgmac, " BGMAC_DMA_RX_INDEX: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_INDEX)); ++ bgmac_err(bgmac, "BGMAC_DMA_RX_RINGLO: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_RINGLO)); ++ bgmac_err(bgmac, "BGMAC_DMA_RX_RINGHI: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_RINGHI)); ++ bgmac_err(bgmac, "BGMAC_DMA_RX_STATUS: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_STATUS)); ++ bgmac_err(bgmac, " BGMAC_DMA_RX_ERROR: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_ERROR)); ++ ++ dma_sync_single_for_device(dma_dev, ++ slot->dma_addr, ++ BGMAC_RX_BUF_SIZE, ++ DMA_FROM_DEVICE); ++ break; ++ } ++ + /* Check for poison and drop or pass the packet */ + if (len == 0xdead && flags == 0xbeef) { + bgmac_err(bgmac, "Found poisoned packet at slot %d, DMA issue!\n", |