* [PATCH net] net: bcmgenet: correctly pad short packets
@ 2014-07-22 18:01 Florian Fainelli
2014-07-23 2:59 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Florian Fainelli @ 2014-07-22 18:01 UTC (permalink / raw)
To: netdev; +Cc: davem, Florian Fainelli
Packets shorter than ETH_ZLEN were not padded with zeroes, hence leaking
potentially sensitive information. This bug has been present since the
driver got accepted in commit 1c1008c793fa46703a2fee469f4235e1c7984333
("net: bcmgenet: add main driver file").
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 16281ad2da12..4e615debe472 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -1149,6 +1149,11 @@ static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev)
goto out;
}
+ if (skb_padto(skb, ETH_ZLEN)) {
+ ret = NETDEV_TX_OK;
+ goto out;
+ }
+
/* set the SKB transmit checksum */
if (priv->desc_64b_en) {
ret = bcmgenet_put_tx_csum(dev, skb);
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net] net: bcmgenet: correctly pad short packets
2014-07-22 18:01 [PATCH net] net: bcmgenet: correctly pad short packets Florian Fainelli
@ 2014-07-23 2:59 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2014-07-23 2:59 UTC (permalink / raw)
To: f.fainelli; +Cc: netdev
From: Florian Fainelli <f.fainelli@gmail.com>
Date: Tue, 22 Jul 2014 11:01:52 -0700
> Packets shorter than ETH_ZLEN were not padded with zeroes, hence leaking
> potentially sensitive information. This bug has been present since the
> driver got accepted in commit 1c1008c793fa46703a2fee469f4235e1c7984333
> ("net: bcmgenet: add main driver file").
>
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Applied and queued up for -stable, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-07-23 2:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-22 18:01 [PATCH net] net: bcmgenet: correctly pad short packets Florian Fainelli
2014-07-23 2:59 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.