Bladeren bron

USB: fix double frees in error code paths of ipaq driver

the error code paths can be enter with buffers to freed buffers.
Serial core would do a kfree() on memory already freed.

Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Oliver Neukum 18 jaren geleden
bovenliggende
commit
ed6590a861
1 gewijzigde bestanden met toevoegingen van 2 en 0 verwijderingen
  1. 2 0
      drivers/usb/serial/ipaq.c

+ 2 - 0
drivers/usb/serial/ipaq.c

@@ -646,11 +646,13 @@ static int ipaq_open(struct usb_serial_port *port, struct file *filp)
 	kfree(port->bulk_out_buffer);
 	kfree(port->bulk_out_buffer);
 	port->bulk_in_buffer = kmalloc(URBDATA_SIZE, GFP_KERNEL);
 	port->bulk_in_buffer = kmalloc(URBDATA_SIZE, GFP_KERNEL);
 	if (port->bulk_in_buffer == NULL) {
 	if (port->bulk_in_buffer == NULL) {
+		port->bulk_out_buffer = NULL; /* prevent double free */
 		goto enomem;
 		goto enomem;
 	}
 	}
 	port->bulk_out_buffer = kmalloc(URBDATA_SIZE, GFP_KERNEL);
 	port->bulk_out_buffer = kmalloc(URBDATA_SIZE, GFP_KERNEL);
 	if (port->bulk_out_buffer == NULL) {
 	if (port->bulk_out_buffer == NULL) {
 		kfree(port->bulk_in_buffer);
 		kfree(port->bulk_in_buffer);
+		port->bulk_in_buffer = NULL;
 		goto enomem;
 		goto enomem;
 	}
 	}
 	port->read_urb->transfer_buffer = port->bulk_in_buffer;
 	port->read_urb->transfer_buffer = port->bulk_in_buffer;