Skip to content

Commit 45c0de1

Browse files
abajkPaolo Abeni
authored andcommitted
net: ethernet: lantiq_etop: fix memory disclosure
When applying padding, the buffer is not zeroed, which results in memory disclosure. The mentioned data is observed on the wire. This patch uses skb_put_padto() to pad Ethernet frames properly. The mentioned function zeroes the expanded buffer. In case the packet cannot be padded it is silently dropped. Statistics are also not incremented. This driver does not support statistics in the old 32-bit format or the new 64-bit format. These will be added in the future. In its current form, the patch should be easily backported to stable versions. Ethernet MACs on Amazon-SE and Danube cannot do padding of the packets in hardware, so software padding must be applied. Fixes: 504d472 ("MIPS: Lantiq: Add ethernet driver") Signed-off-by: Aleksander Jan Bajkowski <[email protected]> Reviewed-by: Jacob Keller <[email protected]> Reviewed-by: Florian Fainelli <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Paolo Abeni <[email protected]>
1 parent e609c95 commit 45c0de1

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/net/ethernet/lantiq_etop.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,9 @@ ltq_etop_tx(struct sk_buff *skb, struct net_device *dev)
481481
unsigned long flags;
482482
u32 byte_offset;
483483

484-
len = skb->len < ETH_ZLEN ? ETH_ZLEN : skb->len;
484+
if (skb_put_padto(skb, ETH_ZLEN))
485+
return NETDEV_TX_OK;
486+
len = skb->len;
485487

486488
if ((desc->ctl & (LTQ_DMA_OWN | LTQ_DMA_C)) || ch->skb[ch->dma.desc]) {
487489
netdev_err(dev, "tx ring full\n");

0 commit comments

Comments
 (0)