lkml.org 
[lkml]   [2022]   [Oct]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 4/6] usb: gadget: uvc: fix sg handling during video encode
    Date
    From: Jeff Vanhoof <qjv001@motorola.com>

    In uvc_video_encode_isoc_sg, the uvc_request's sg list is
    incorrectly being populated leading to corrupt video being
    received by the remote end. When building the sg list the
    usage of buf->sg's 'dma_length' field is not correct and
    instead its 'length' field should be used.

    Fixes: e81e7f9a0eb9 ("usb: gadget: uvc: add scatter gather support")
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Jeff Vanhoof <qjv001@motorola.com>
    Signed-off-by: Dan Vacura <w36195@motorola.com>
    ---
    V1 -> V3:
    - no change, new patch in series

    drivers/usb/gadget/function/uvc_video.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/usb/gadget/function/uvc_video.c b/drivers/usb/gadget/function/uvc_video.c
    index dd54841b0b3e..7d4508a83d5d 100644
    --- a/drivers/usb/gadget/function/uvc_video.c
    +++ b/drivers/usb/gadget/function/uvc_video.c
    @@ -157,10 +157,10 @@ 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 || !sg_dma_len(buf->sg))
    + if (!len || !buf->sg || !buf->sg->length)
    break;

    - sg_left = sg_dma_len(buf->sg) - buf->offset;
    + sg_left = buf->sg->length - buf->offset;
    part = min_t(unsigned int, len, sg_left);

    sg_set_page(iter, sg_page(buf->sg), part, buf->offset);
    --
    2.34.1
    \
     
     \ /
      Last update: 2022-10-17 22:56    [W:2.919 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site