History

USB: mos7840: fix memory leak in open

Allocated urbs and buffers were never freed on errors in open.

Johan Hovold committed 13 years ago

Commit 5f8a2e61 parent 878c69a1 file · +17 −8Browse files

Unified · Split

drivers/usb/serial/mos7840.c+17−8
@@ -905,20 +905,20 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port) · 904 unmodified lines
905905 status = mos7840_get_reg_sync(port, mos7840_port->SpRegOffset, &Data);
906906 if (status < 0) {
907907 dev_dbg(&port->dev, "Reading Spreg failed\n");
908− return -1;
908+ goto err;
909909 }
910910 Data |= 0x80;
911911 status = mos7840_set_reg_sync(port, mos7840_port->SpRegOffset, Data);
912912 if (status < 0) {
913913 dev_dbg(&port->dev, "writing Spreg failed\n");
914− return -1;
914+ goto err;
915915 }
916916
917917 Data &= ~0x80;
918918 status = mos7840_set_reg_sync(port, mos7840_port->SpRegOffset, Data);
919919 if (status < 0) {
920920 dev_dbg(&port->dev, "writing Spreg failed\n");
921− return -1;
921+ goto err;
922922 }
923923 /* End of block to be checked */
924924
@@ -927,7 +927,7 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port) · 2 unmodified lines
927927 &Data);
928928 if (status < 0) {
929929 dev_dbg(&port->dev, "Reading Controlreg failed\n");
930− return -1;
930+ goto err;
931931 }
932932 Data |= 0x08; /* Driver done bit */
933933 Data |= 0x20; /* rx_disable */
@@ -935,7 +935,7 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port) · 1 unmodified line
935935 mos7840_port->ControlRegOffset, Data);
936936 if (status < 0) {
937937 dev_dbg(&port->dev, "writing Controlreg failed\n");
938− return -1;
938+ goto err;
939939 }
940940 /* do register settings here */
941941 /* Set all regs to the device default values. */
@@ -946,21 +946,21 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port) · 4 unmodified lines
946946 status = mos7840_set_uart_reg(port, INTERRUPT_ENABLE_REGISTER, Data);
947947 if (status < 0) {
948948 dev_dbg(&port->dev, "disabling interrupts failed\n");
949− return -1;
949+ goto err;
950950 }
951951 /* Set FIFO_CONTROL_REGISTER to the default value */
952952 Data = 0x00;
953953 status = mos7840_set_uart_reg(port, FIFO_CONTROL_REGISTER, Data);
954954 if (status < 0) {
955955 dev_dbg(&port->dev, "Writing FIFO_CONTROL_REGISTER failed\n");
956− return -1;
956+ goto err;
957957 }
958958
959959 Data = 0xcf;
960960 status = mos7840_set_uart_reg(port, FIFO_CONTROL_REGISTER, Data);
961961 if (status < 0) {
962962 dev_dbg(&port->dev, "Writing FIFO_CONTROL_REGISTER failed\n");
963− return -1;
963+ goto err;
964964 }
965965
966966 Data = 0x03;
@@ -1103,6 +1103,15 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port) · 136 unmodified lines
11031103 /* mos7840_change_port_settings(mos7840_port,old_termios); */
11041104
11051105 return 0;
1106+err:
1107+ for (j = 0; j < NUM_URBS; ++j) {
1108+ urb = mos7840_port->write_urb_pool[j];
1109+ if (!urb)
1110+ continue;
1111+ kfree(urb->transfer_buffer);
1112+ usb_free_urb(urb);
1113+ }
1114+ return status;
11061115 }
11071116
11081117 /*****************************************************************************

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t