lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB: ir-usb: fix double free

Browse Source 
If the user specifies a custom bulk buffer size we get a double free at
port release.

Cc: stable <stable@kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Johan Hovold
2010-05-13 21:02:00 +02:00
committed by Greg Kroah-Hartman
parent 16032c4f5b
commit 2ff78c0c2b
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/usb/serial/ir-usb.c
View File

@@ -312,6 +312,7 @@ static int ir_open(struct tty_struct *tty, struct usb_serial_port *port)
kfree(port->read_urb->transfer_buffer); kfree(port->read_urb->transfer_buffer);
port->read_urb->transfer_buffer = buffer; port->read_urb->transfer_buffer = buffer;
port->read_urb->transfer_buffer_length = buffer_size; port->read_urb->transfer_buffer_length = buffer_size;
port->bulk_in_buffer = buffer;
buffer = kmalloc(buffer_size, GFP_KERNEL); buffer = kmalloc(buffer_size, GFP_KERNEL);
if (!buffer) { if (!buffer) {
@@ -321,6 +322,7 @@ static int ir_open(struct tty_struct *tty, struct usb_serial_port *port)
kfree(port->write_urb->transfer_buffer); kfree(port->write_urb->transfer_buffer);
port->write_urb->transfer_buffer = buffer; port->write_urb->transfer_buffer = buffer;
port->write_urb->transfer_buffer_length = buffer_size; port->write_urb->transfer_buffer_length = buffer_size;
port->bulk_out_buffer = buffer;
port->bulk_out_size = buffer_size; port->bulk_out_size = buffer_size;
} }