Skip to content

Commit

Permalink
[media] usbvision-video: fix memory leak of alt_max_pkt_size
Browse files Browse the repository at this point in the history
1. usbvision->alt_max_pkt_size is not deallocated anywhere.
2. if allocation of usbvision->alt_max_pkt_size fails,
there is no proper deallocation of already acquired resources.
The patch adds kfree(usbvision->alt_max_pkt_size) to
usbvision_release() as soon as other deallocations happen there.
It calls usbvision_release() if allocation of
usbvision->alt_max_pkt_size fails as soon as usbvision_release()
is safe to work with incompletely initialized usbvision structure.
Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Alexey Khoroshilov authored and Mauro Carvalho Chehab committed Jun 21, 2013
1 parent b610b59 commit 090c65b
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/media/usb/usbvision/usbvision-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -1460,6 +1460,7 @@ static void usbvision_release(struct usb_usbvision *usbvision)

usbvision_remove_sysfs(usbvision->vdev);
usbvision_unregister_video(usbvision);
kfree(usbvision->alt_max_pkt_size);

usb_free_urb(usbvision->ctrl_urb);

Expand Down Expand Up @@ -1575,6 +1576,7 @@ static int usbvision_probe(struct usb_interface *intf,
usbvision->alt_max_pkt_size = kmalloc(32 * usbvision->num_alt, GFP_KERNEL);
if (usbvision->alt_max_pkt_size == NULL) {
dev_err(&intf->dev, "usbvision: out of memory!\n");
usbvision_release(usbvision);
return -ENOMEM;
}

Expand Down

0 comments on commit 090c65b

Please sign in to comment.