Commit 43f77e91 authored Jul 12, 2008 by Darren Jenkins Committed by Linus Torvalds Jul 12, 2008

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>

parent a26929fb

drivers/char/pcmcia/ipwireless/hardware.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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);