[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1334222448.5300.6046.camel@edumazet-glaptop>
Date: Thu, 12 Apr 2012 11:20:48 +0200
From: Eric Dumazet <eric.dumazet@...il.com>
To: Will Deacon <will.deacon@....com>
Cc: netdev@...r.kernel.org,
Steve Glendinning <steve.glendinning@...c.com>
Subject: Re: [PATCH] net: smsc911x: fix RX FIFO fastforwarding when
dropping packets
On Thu, 2012-04-12 at 10:07 +0100, Will Deacon wrote:
> The SMSC911x ethernet controller provides a mechanism for quickly
> skipping to the start of the next frame in the receive FIFO, however
> the current code passes the number of words to a function that expects
> the number of bytes. This can corrupt the FIFO head in the case that
> the fastforward mechanism is not used.
>
> This patch fixes the callers of smsc911x_rx_fastforward to pass the
> correct data size.
>
> Cc: Steve Glendinning <steve.glendinning@...c.com>
> Signed-off-by: Will Deacon <will.deacon@....com>
> ---
> drivers/net/ethernet/smsc/smsc911x.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
> index 4a69710..b5599bc 100644
> --- a/drivers/net/ethernet/smsc/smsc911x.c
> +++ b/drivers/net/ethernet/smsc/smsc911x.c
> @@ -1228,7 +1228,7 @@ static int smsc911x_poll(struct napi_struct *napi, int budget)
> "Discarding packet with error bit set");
> /* Packet has an error, discard it and continue with
> * the next */
> - smsc911x_rx_fastforward(pdata, pktwords);
> + smsc911x_rx_fastforward(pdata, pktlength);
> dev->stats.rx_dropped++;
> continue;
> }
> @@ -1238,7 +1238,7 @@ static int smsc911x_poll(struct napi_struct *napi, int budget)
> SMSC_WARN(pdata, rx_err,
> "Unable to allocate skb for rx packet");
> /* Drop the packet and stop this polling iteration */
> - smsc911x_rx_fastforward(pdata, pktwords);
> + smsc911x_rx_fastforward(pdata, pktlength);
> dev->stats.rx_dropped++;
> break;
> }
Hum, looking at this driver, I see wrong code in lines 1246/1247
skb->data = skb->head;
skb_reset_tail_pointer(skb);
I suspect its hiding a buffer overflow bug or something.
netdev_alloc_skb() reserved NET_SKB_PAD bytes. A driver should not
un-reserve this headroom, or some networking setups can be very slow.
So
pdata->ops->rx_readfifo(pdata,
(unsigned int *)skb->head, pktwords);
also should be fixed to use skb->data instead.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists