浏览代码

usb: usbip: set buffer pointers to NULL after free

The usbip stack dynamically allocates the transfer_buffer and
setup_packet of each urb that got generated by the tcp to usb stub code.
As these pointers are always used only once we will set them to NULL
after use. This is done likewise to the free_urb code in vudc_dev.c.
This patch fixes double kfree situations where the usbip remote side
added the URB_FREE_BUFFER.

Cc: stable@vger.kernel.org
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Acked-by: Shuah Khan <shuahkh@osg.samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Michael Grzeschik 8 年之前
父节点
当前提交
b3b51417d0
共有 2 个文件被更改,包括 8 次插入0 次删除
  1. 4 0
      drivers/usb/usbip/stub_main.c
  2. 4 0
      drivers/usb/usbip/stub_tx.c

+ 4 - 0
drivers/usb/usbip/stub_main.c

@@ -262,7 +262,11 @@ void stub_device_cleanup_urbs(struct stub_device *sdev)
 		kmem_cache_free(stub_priv_cache, priv);
 		kmem_cache_free(stub_priv_cache, priv);
 
 
 		kfree(urb->transfer_buffer);
 		kfree(urb->transfer_buffer);
+		urb->transfer_buffer = NULL;
+
 		kfree(urb->setup_packet);
 		kfree(urb->setup_packet);
+		urb->setup_packet = NULL;
+
 		usb_free_urb(urb);
 		usb_free_urb(urb);
 	}
 	}
 }
 }

+ 4 - 0
drivers/usb/usbip/stub_tx.c

@@ -28,7 +28,11 @@ static void stub_free_priv_and_urb(struct stub_priv *priv)
 	struct urb *urb = priv->urb;
 	struct urb *urb = priv->urb;
 
 
 	kfree(urb->setup_packet);
 	kfree(urb->setup_packet);
+	urb->setup_packet = NULL;
+
 	kfree(urb->transfer_buffer);
 	kfree(urb->transfer_buffer);
+	urb->transfer_buffer = NULL;
+
 	list_del(&priv->list);
 	list_del(&priv->list);
 	kmem_cache_free(stub_priv_cache, priv);
 	kmem_cache_free(stub_priv_cache, priv);
 	usb_free_urb(urb);
 	usb_free_urb(urb);