Skip to content

Commit a56e764

Browse files
Vastargazinggregkh
authored andcommitted
media: pwc: Drain fill_buf on start_streaming() failure
commit 906e410 upstream. pwc_isoc_init() submits its isochronous URBs with usb_submit_urb(.., GFP_KERNEL) in a loop. After the first URB is submitted, its completion handler pwc_isoc_handler() can run on another CPU before the loop finishes: start_streaming() pwc_isoc_init() usb_submit_urb(urbs[0], GFP_KERNEL) pwc_isoc_handler(urbs[0]) pdev->fill_buf = pwc_get_next_fill_buf(pdev) usb_submit_urb(urbs[i>0], ..) -> fails pwc_isoc_cleanup(pdev) /* kills URBs */ return ret; pwc_cleanup_queued_bufs(pdev, VB2_BUF_STATE_QUEUED) pwc_get_next_fill_buf() detaches a buffer from pdev->queued_bufs and stores it in pdev->fill_buf. The error path in start_streaming() only drains pdev->queued_bufs, so the buffer parked in pdev->fill_buf is leaked. vb2_start_streaming() then triggers WARN_ON(owned_by_drv_count). stop_streaming() already handles this since commit 80b0963 ("[media] pwc: fix WARN_ON"), which added the fill_buf drain in the teardown path but not in the start_streaming() error path. Mirror that handling on failure so start_streaming() returns with no buffer owned by the driver. Issue identified by automated review of the INV-003 series at https://sashiko.dev/ Fixes: 885fe18 ("[media] pwc: Replace private buffer management code with videobuf2") Cc: stable@vger.kernel.org Signed-off-by: Valery Borovsky <vebohr@gmail.com> Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 46715fe commit a56e764

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

drivers/media/usb/pwc/pwc-if.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -727,6 +727,11 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
727727
pwc_camera_power(pdev, 0);
728728
/* And cleanup any queued bufs!! */
729729
pwc_cleanup_queued_bufs(pdev, VB2_BUF_STATE_QUEUED);
730+
if (pdev->fill_buf) {
731+
vb2_buffer_done(&pdev->fill_buf->vb.vb2_buf,
732+
VB2_BUF_STATE_QUEUED);
733+
pdev->fill_buf = NULL;
734+
}
730735
}
731736
mutex_unlock(&pdev->v4l2_lock);
732737

0 commit comments

Comments
 (0)