usb: gadget: uvc: improve sg exit condition
authorMichael Grzeschik <m.grzeschik@pengutronix.de>
Sat, 2 Apr 2022 23:27:44 +0000 (01:27 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 29 Oct 2022 08:12:53 +0000 (10:12 +0200)
commit aef11279888c00e1841a3533a35d279285af3a51 upstream.

The exit condition to quit iterating over the sg_list, while encoding
the sg entries, has to consider the case that the dma_len of the entry
could be zero. This patch takes this condition to account.

Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Link: https://lore.kernel.org/r/20220402232744.3622565-4-m.grzeschik@pengutronix.de
Cc: Dan Vacura <w36195@motorola.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/gadget/function/uvc_video.c

index 8b49bbcd894eafbad0a5326f4074f94b351aa585..1889d75f87881a818d7205b84f5f17f37e81cef1 100644 (file)
@@ -126,7 +126,7 @@ uvc_video_encode_isoc_sg(struct usb_request *req, struct uvc_video *video,
        sg = sg_next(sg);
 
        for_each_sg(sg, iter, ureq->sgt.nents - 1, i) {
-               if (!len || !buf->sg)
+               if (!len || !buf->sg || !sg_dma_len(buf->sg))
                        break;
 
                sg_left = sg_dma_len(buf->sg) - buf->offset;