Commit fa865ba1 authored by Wenwen Wang's avatar Wenwen Wang Committed by David S. Miller

firestream: fix memory leaks

In fs_open(), 'vcc' is allocated through kmalloc() and assigned to
'atm_vcc->dev_data.' In the following execution, if an error occurs, e.g.,
there is no more free channel, an error code EBUSY or ENOMEM will be
returned. However, 'vcc' is not deallocated, leading to memory leaks. Note
that, in normal cases where fs_open() returns 0, 'vcc' will be deallocated
in fs_close(). But, if fs_open() fails, there is no guarantee that
fs_close() will be invoked.

To fix this issue, deallocate 'vcc' before the error code is returned.
Signed-off-by: default avatarWenwen Wang <wenwen@cs.uga.edu>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6badad1c
...@@ -912,6 +912,7 @@ static int fs_open(struct atm_vcc *atm_vcc) ...@@ -912,6 +912,7 @@ static int fs_open(struct atm_vcc *atm_vcc)
} }
if (!to) { if (!to) {
printk ("No more free channels for FS50..\n"); printk ("No more free channels for FS50..\n");
kfree(vcc);
return -EBUSY; return -EBUSY;
} }
vcc->channo = dev->channo; vcc->channo = dev->channo;
...@@ -922,6 +923,7 @@ static int fs_open(struct atm_vcc *atm_vcc) ...@@ -922,6 +923,7 @@ static int fs_open(struct atm_vcc *atm_vcc)
if (((DO_DIRECTION(rxtp) && dev->atm_vccs[vcc->channo])) || if (((DO_DIRECTION(rxtp) && dev->atm_vccs[vcc->channo])) ||
( DO_DIRECTION(txtp) && test_bit (vcc->channo, dev->tx_inuse))) { ( DO_DIRECTION(txtp) && test_bit (vcc->channo, dev->tx_inuse))) {
printk ("Channel is in use for FS155.\n"); printk ("Channel is in use for FS155.\n");
kfree(vcc);
return -EBUSY; return -EBUSY;
} }
} }
...@@ -935,6 +937,7 @@ static int fs_open(struct atm_vcc *atm_vcc) ...@@ -935,6 +937,7 @@ static int fs_open(struct atm_vcc *atm_vcc)
tc, sizeof (struct fs_transmit_config)); tc, sizeof (struct fs_transmit_config));
if (!tc) { if (!tc) {
fs_dprintk (FS_DEBUG_OPEN, "fs: can't alloc transmit_config.\n"); fs_dprintk (FS_DEBUG_OPEN, "fs: can't alloc transmit_config.\n");
kfree(vcc);
return -ENOMEM; return -ENOMEM;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment