]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ATM]: Fix dereference of uninitialized pointer in zatm
authorAl Viro <viro@zeniv.linux.org.uk>
Fri, 2 Sep 2005 19:18:03 +0000 (12:18 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 2 Sep 2005 19:18:03 +0000 (12:18 -0700)
Fixing breakage from [NET]: Kill skb->list - original was
assign vcc
do a bunch of stuff using ZATM_VCC(vcc)->pool as common subexpression
Now we do
int pos = ZATM_VCC(vcc)->pool;
assign vcc
do a bunch of stuff
even though vcc is not even initialized when we enter that block...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/atm/zatm.c

index c4b75ecf9460442d3dea8fba8ce0628cb315b801..55959e4d1cb77d3aef5269340fff23241f873d58 100644 (file)
@@ -417,9 +417,9 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
                chan = (here[3] & uPD98401_AAL5_CHAN) >>
                    uPD98401_AAL5_CHAN_SHIFT;
                if (chan < zatm_dev->chans && zatm_dev->rx_map[chan]) {
-                       int pos = ZATM_VCC(vcc)->pool;
-
+                       int pos;
                        vcc = zatm_dev->rx_map[chan];
+                       pos = ZATM_VCC(vcc)->pool;
                        if (skb == zatm_dev->last_free[pos])
                                zatm_dev->last_free[pos] = NULL;
                        skb_unlink(skb, zatm_dev->pool + pos);