aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn
diff options
context:
space:
mode:
authorTilman Schmidt <tilman@imap.cc>2010-07-05 14:19:19 +0000
committerDavid S. Miller <davem@davemloft.net>2010-07-07 16:57:55 -0700
commit54438f9dfcc3902a8ee74ceb8ef71316d9ef98a3 (patch)
treee7fb7cfd04940039d6bf54e15850b56a78680364 /drivers/isdn
parent7d060ed2877ff6d00e7238226edbaf91493d6d0b (diff)
downloadkernel_samsung_aries-54438f9dfcc3902a8ee74ceb8ef71316d9ef98a3.zip
kernel_samsung_aries-54438f9dfcc3902a8ee74ceb8ef71316d9ef98a3.tar.gz
kernel_samsung_aries-54438f9dfcc3902a8ee74ceb8ef71316d9ef98a3.tar.bz2
isdn/gigaset: fix leaks in error path
Take care to free all previously allocated ressources in the "out of memory" error path of the ISDN_CMD_DIAL branch. Based on an original patch by Dan Carpenter. Impact: bugfix Reported-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Tilman Schmidt <tilman@imap.cc> Acked-by: Dan Carpenter <error27@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn')
-rw-r--r--drivers/isdn/gigaset/i4l.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/isdn/gigaset/i4l.c b/drivers/isdn/gigaset/i4l.c
index 1d084bb..34bca37 100644
--- a/drivers/isdn/gigaset/i4l.c
+++ b/drivers/isdn/gigaset/i4l.c
@@ -419,6 +419,8 @@ oom:
dev_err(bcs->cs->dev, "out of memory\n");
for (i = 0; i < AT_NUM; ++i)
kfree(commands[i]);
+ kfree(commands);
+ gigaset_free_channel(bcs);
return -ENOMEM;
}