]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
3c515: Write outside array bounds
authorroel kluin <roel.kluin@gmail.com>
Thu, 30 Jul 2009 00:26:32 +0000 (00:26 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 30 Jul 2009 20:27:28 +0000 (13:27 -0700)
if dev_alloc_skb() fails on the first iteration, a write to
cp->rx_ring[-1] occurs.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/3c515.c

index 3e00fa8ea65f106544c7a5f67a4c6535d499c690..4a7c32895be52fecbd2ce7ae87d75b639b4dc15a 100644 (file)
@@ -832,7 +832,9 @@ static int corkscrew_open(struct net_device *dev)
                        skb_reserve(skb, 2);    /* Align IP on 16 byte boundaries */
                        vp->rx_ring[i].addr = isa_virt_to_bus(skb->data);
                }
-               vp->rx_ring[i - 1].next = isa_virt_to_bus(&vp->rx_ring[0]);     /* Wrap the ring. */
+               if (i != 0)
+                       vp->rx_ring[i - 1].next =
+                               isa_virt_to_bus(&vp->rx_ring[0]);       /* Wrap the ring. */
                outl(isa_virt_to_bus(&vp->rx_ring[0]), ioaddr + UpListPtr);
        }
        if (vp->full_bus_master_tx) {   /* Boomerang bus master Tx. */