summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDarren Jenkins <darrenrjenkins@gmail.com>2008-07-12 20:47:49 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-12 21:33:41 (GMT)
commit43f77e91eadbc290eb76a08110a039c809dde6c9 (patch)
treedb580a0c9514ea29950c1daeda5cf4345e7d7fd3 /drivers
parenta26929fb489188ff959b1715ee67f0c9f84405b5 (diff)
downloadlinux-43f77e91eadbc290eb76a08110a039c809dde6c9.tar.xz
drivers/char/pcmcia/ipwireless/hardware.c fix resource leak
Coverity CID: 2172 RESOURCE_LEAK When pool_allocate() tries to enlarge a packet, if it can not allocate enough memory, it returns NULL without first freeing the old packet. This patch just frees the packet first. Signed-off-by: Darren Jenkins <darrenrjenkins@gmail.com> Acked-by: Jiri Kosina <jkosina@suse.cz> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/pcmcia/ipwireless/hardware.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/char/pcmcia/ipwireless/hardware.c b/drivers/char/pcmcia/ipwireless/hardware.c
index ba6340a..929101e 100644
--- a/drivers/char/pcmcia/ipwireless/hardware.c
+++ b/drivers/char/pcmcia/ipwireless/hardware.c
@@ -590,8 +590,10 @@ static struct ipw_rx_packet *pool_allocate(struct ipw_hardware *hw,
packet = kmalloc(sizeof(struct ipw_rx_packet) +
old_packet->length + minimum_free_space,
GFP_ATOMIC);
- if (!packet)
+ if (!packet) {
+ kfree(old_packet);
return NULL;
+ }
memcpy(packet, old_packet,
sizeof(struct ipw_rx_packet)
+ old_packet->length);