Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd8ad6ed authored by Pavel Skripkin's avatar Pavel Skripkin Committed by Greg Kroah-Hartman
Browse files

media: stkwebcam: fix memory leak in stk_camera_probe 



commit 514e97674400462cc09c459a1ddfb9bf39017223 upstream.

My local syzbot instance hit memory leak in usb_set_configuration().
The problem was in unputted usb interface. In case of errors after
usb_get_intf() the reference should be putted to correclty free memory
allocated for this interface.

Fixes: ec16dae5 ("V4L/DVB (7019): V4L: add support for Syntek DC1125 webcams")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarPavel Skripkin <paskripkin@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9febc915

drivers/media/usb/stkwebcam/stk-webcam.c

+4 −2
Original line number Diff line number Diff line
@@ -1346,7 +1346,7 @@ static int stk_camera_probe(struct usb_interface *interface, 
	if (!dev->isoc_ep) {

		pr_err("Could not find isoc-in endpoint\n");

		err = -ENODEV;

		goto error;

		goto error_put;

	}

	dev->vsettings.palette = V4L2_PIX_FMT_RGB565;

	dev->vsettings.mode = MODE_VGA;
@@ -1359,10 +1359,12 @@ static int stk_camera_probe(struct usb_interface *interface, 


	err = stk_register_video_device(dev);

	if (err)

		goto error;

		goto error_put;



	return 0;



error_put:

	usb_put_intf(interface);

error:

	v4l2_ctrl_handler_free(hdl);

	v4l2_device_unregister(&dev->v4l2_dev);