diff options
| author |   Aaro Koskinen <aaro.koskinen@nokia.com> | 2019-03-27 22:35:39 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-03-31 14:00:59 -0700 |
| commit | 8ac0c24fe1c256af6644caf3d311029440ec2fbd (patch) | |
| tree | 2440007b002f78e11a6f585c6b55cce877256cd2 | |
| parent | net: stmmac: don't overwrite discard_frame status (diff) | |
| download | linux-dev-8ac0c24fe1c256af6644caf3d311029440ec2fbd.tar.xz linux-dev-8ac0c24fe1c256af6644caf3d311029440ec2fbd.zip | |
net: stmmac: fix dropping of multi-descriptor RX frames
Packets without the last descriptor set should be dropped early. If we
receive a frame larger than the DMA buffer, the HW will continue using the
next descriptor. Driver mistakes these as individual frames, and sometimes
a truncated frame (without the LD set) may look like a valid packet.
This fixes a strange issue where the system replies to 4098-byte ping
although the MTU/DMA buffer size is set to 4096, and yet at the same
time it's logging an oversized packet.
Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/enh_desc.c b/drivers/net/ethernet/stmicro/stmmac/enh_desc.c index c42ef6c729c0..5202d6ad7919 100644 --- a/drivers/net/ethernet/stmicro/stmmac/enh_desc.c +++ b/drivers/net/ethernet/stmicro/stmmac/enh_desc.c @@ -201,6 +201,11 @@ static int enh_desc_get_rx_status(void *data, struct stmmac_extra_stats *x, if (unlikely(rdes0 & RDES0_OWN)) return dma_own; + if (unlikely(!(rdes0 & RDES0_LAST_DESCRIPTOR))) { + stats->rx_length_errors++; + return discard_frame; + } + if (unlikely(rdes0 & RDES0_ERROR_SUMMARY)) { if (unlikely(rdes0 & RDES0_DESCRIPTOR_ERROR)) { x->rx_desc++; |