Skip to content

Commit 1dc282d

Browse files
w23pelwell
authored andcommitted
usb: gadget: uvc: use correct buffer size when parsing configfs lists
This commit fixes uvc gadget support on 32-bit platforms. Commit 0df2860 ("usb: gadget: uvc: Generalise helper functions for reuse") introduced a helper function __uvcg_iter_item_entries() to aid with parsing lists of items on configfs attributes stores. This function is a generalization of another very similar function, which used a stack-allocated temporary buffer of fixed size for each item in the list and used the sizeof() operator to check for potential buffer overruns. The new function was changed to allocate the now variably sized temp buffer on heap, but wasn't properly updated to also check for max buffer size using the computed size instead of sizeof() operator. As a result, the maximum item size was 7 (plus null terminator) on 64-bit platforms, and 3 on 32-bit ones. While 7 is accidentally just barely enough, 3 is definitely too small for some of UVC configfs attributes. For example, dwFrameInteval, specified in 100ns units, usually has 6-digit item values, e.g. 166666 for 60fps. Fixes: 0df2860 ("usb: gadget: uvc: Generalise helper functions for reuse") Signed-off-by: Ivan Avdeev <[email protected]>
1 parent 15669e6 commit 1dc282d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/usb/gadget/function/uvc_configfs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ static int __uvcg_iter_item_entries(const char *page, size_t len,
9292

9393
while (pg - page < len) {
9494
i = 0;
95-
while (i < sizeof(buf) && (pg - page < len) &&
95+
while (i < bufsize && (pg - page < len) &&
9696
*pg != '\0' && *pg != '\n')
9797
buf[i++] = *pg++;
98-
if (i == sizeof(buf)) {
98+
if (i == bufsize) {
9999
ret = -EINVAL;
100100
goto out_free_buf;
101101
}

0 commit comments

Comments
 (0)