[PATCH] USB: free allocated memory on io_edgeport startup memory failure (bfd5df3c) · Commits · 戴 / test

While an Edgeport is allocating individual port structures, if kmalloc returns NULL, the serial structure is freed and -ENOMEM, but the ports allocated before the failure are not freed. This patch addresses that condition. Signed-off-by:

Christopher Lund <docmax@gmail.com> Signed-off-by:

Greg Kroah-Hartman <gregkh@suse.de>

drivers/usb/serial/io_edgeport.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -2730,7 +2730,7 @@ static int edge_startup (struct usb_serial *serial)
		struct edgeport_serial *edge_serial;
		struct edgeport_port *edge_port;
		struct usb_device *dev;
		int i;
		int i, j;

		dev = serial->dev;

		@@ -2794,6 +2794,10 @@ static int edge_startup (struct usb_serial *serial)
		edge_port = kmalloc (sizeof(struct edgeport_port), GFP_KERNEL);
		if (edge_port == NULL) {
		dev_err(&serial->dev->dev, "%s - Out of memory\n", __FUNCTION__);
		for (j = 0; j < i; ++j) {
		kfree (usb_get_serial_port_data(serial->port[j]));
		usb_set_serial_port_data(serial->port[j], NULL);
		}
		usb_set_serial_data(serial, NULL);
		kfree(edge_serial);
		return -ENOMEM;

Admin message