]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
usb: gadget: uvc: configfs: Prevent format changes after linking header
authorJoel Pepper <joel.pepper@rwth-aachen.de>
Tue, 29 May 2018 19:02:12 +0000 (21:02 +0200)
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Mon, 24 Sep 2018 16:01:56 +0000 (19:01 +0300)
While checks are in place to avoid attributes and children of a format
being manipulated after the format is linked into the streaming header,
the linked flag was never actually set, invalidating the protections.
Update the flag as appropriate in the header link calls.

Signed-off-by: Joel Pepper <joel.pepper@rwth-aachen.de>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
drivers/usb/gadget/function/uvc_configfs.c

index b8763343dcae49ab47a7012739868118e84c36ae..799dc32c5bc751a8cd097fdaf0db326b1472c686 100644 (file)
@@ -928,6 +928,7 @@ static int uvcg_streaming_header_allow_link(struct config_item *src,
        format_ptr->fmt = target_fmt;
        list_add_tail(&format_ptr->entry, &src_hdr->formats);
        ++src_hdr->num_fmt;
+       ++target_fmt->linked;
 
 out:
        mutex_unlock(&opts->lock);
@@ -965,6 +966,8 @@ static void uvcg_streaming_header_drop_link(struct config_item *src,
                        break;
                }
 
+       --target_fmt->linked;
+
 out:
        mutex_unlock(&opts->lock);
        mutex_unlock(su_mutex);