projects/linux·commit 852fef69

fix for a memory leak in an error case introduced by fix for double free

852fef69 · Oliver Neukum <[email protected]> · 2008-07-26 22:42:42 +02:00

The fix NULLed a pointer without freeing it.

Signed-off-by: Oliver Neukum <[email protected]>
Reported-by: Juha Motorsportcom <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Commit
852fef69c0d9510a28a70221cfddd004efa02552
Parents
9ee08c2d

Changes

1 files changed · +6 −4

FileStatusAddDelContent
drivers/usb/serial/ipaq.cmodified+6−4View file

drivers/usb/serial/ipaq.c

View file
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
index 832a5a4..cd9a2e1 100644
--- a/drivers/usb/serial/ipaq.c
+++ b/drivers/usb/serial/ipaq.c
@@ -651,15 +651,17 @@ static int ipaq_open(struct tty_struct *tty,
*/
kfree(port->bulk_in_buffer);
+ kfree(port->bulk_out_buffer);
+ /* make sure the generic serial code knows */
+ port->bulk_out_buffer = NULL;
+
port->bulk_in_buffer = kmalloc(URBDATA_SIZE, GFP_KERNEL);
- if (port->bulk_in_buffer == NULL) {
- port->bulk_out_buffer = NULL; /* prevent double free */
+ if (port->bulk_in_buffer == NULL)
goto enomem;
- }
- kfree(port->bulk_out_buffer);
port->bulk_out_buffer = kmalloc(URBDATA_SIZE, GFP_KERNEL);
if (port->bulk_out_buffer == NULL) {
+ /* the buffer is useless, free it */
kfree(port->bulk_in_buffer);
port->bulk_in_buffer = NULL;
goto enomem;