diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2014-07-22 11:01:52 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-14 09:51:47 +0800 |
| commit | 34ada3629e591ddb43c1aa799f5e4f39b1a1597a (patch) | |
| tree | ba209fdc30dc2a7c6ebf1878b4151989b66197f5 | |
| parent | 0617859f504df3a9f3b8d8765be98eae066621c8 (diff) | |
| download | lwn-34ada3629e591ddb43c1aa799f5e4f39b1a1597a.tar.gz lwn-34ada3629e591ddb43c1aa799f5e4f39b1a1597a.zip | |
net: bcmgenet: correctly pad short packets
[ Upstream commit 474ea9cafc459976827a477f2c30eaf6313cb7c1 ]
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/ethernet/broadcom/genet/bcmgenet.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index 0966bd04375f..837224639148 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); |