Commit bbc80a97 authored May 17, 2021 by Pavel Skripkin Committed by Greg Kroah-Hartman Jul 20, 2021

media: zr364xx: fix memory leak in zr364xx_start_readpipe



commit 0a045eac8d0427b64577a24d74bb8347c905ac65 upstream.

syzbot reported memory leak in zr364xx driver.
The problem was in non-freed urb in case of
usb_submit_urb() fail.

backtrace:
  [<ffffffff82baedf6>] kmalloc include/linux/slab.h:561 [inline]
  [<ffffffff82baedf6>] usb_alloc_urb+0x66/0xe0 drivers/usb/core/urb.c:74
  [<ffffffff82f7cce8>] zr364xx_start_readpipe+0x78/0x130 drivers/media/usb/zr364xx/zr364xx.c:1022
  [<ffffffff84251dfc>] zr364xx_board_init drivers/media/usb/zr364xx/zr364xx.c:1383 [inline]
  [<ffffffff84251dfc>] zr364xx_probe+0x6a3/0x851 drivers/media/usb/zr364xx/zr364xx.c:1516
  [<ffffffff82bb6507>] usb_probe_interface+0x177/0x370 drivers/usb/core/driver.c:396
  [<ffffffff826018a9>] really_probe+0x159/0x500 drivers/base/dd.c:576

Fixes: ccbf035a ("V4L/DVB (12278): zr364xx: implement V4L2_CAP_STREAMING")
Cc: stable@vger.kernel.org
Reported-by:  <syzbot+af4fa391ef18efdd5f69@syzkaller.appspotmail.com>
Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent f1a3aeb0

drivers/media/usb/zr364xx/zr364xx.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1066,6 +1066,7 @@ static int zr364xx_start_readpipe(struct zr364xx_camera *cam)
	DBG("submitting URB %p\n", pipe_info->stream_urb);		DBG("submitting URB %p\n", pipe_info->stream_urb);
	retval = usb_submit_urb(pipe_info->stream_urb, GFP_KERNEL);		retval = usb_submit_urb(pipe_info->stream_urb, GFP_KERNEL);
	if (retval) {		if (retval) {
			usb_free_urb(pipe_info->stream_urb);
	printk(KERN_ERR KBUILD_MODNAME ": start read pipe failed\n");		printk(KERN_ERR KBUILD_MODNAME ": start read pipe failed\n");
	return retval;		return retval;
	}		}