Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <e06f4b2e-93a4-c231-3972-0b30382ddfbc@gmail.com>
Date:   Tue, 6 Dec 2022 22:43:18 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0)
 Gecko/20100101 Thunderbird/102.5.1
Subject: Re: [PATCH v3] usb: gadget: uvc: Prevent buffer overflow in setup
 handler
To:     dan.scally@ideasonboard.com,
        Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc:     Felipe Balbi <balbi@kernel.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
References: <9ffc4812-ab45-d7f9-7d93-fcacf629a754@ideasonboard.com>
 <20221206141301.51305-1-szymon.heidrich@gmail.com>
 <Y4+ybPL2uUO4SCJJ@pendragon.ideasonboard.com>
Content-Language: en-US
From:   Szymon Heidrich <szymon.heidrich@gmail.com>
In-Reply-To: <Y4+ybPL2uUO4SCJJ@pendragon.ideasonboard.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 06/12/2022 22:21, Laurent Pinchart wrote:
> Hi Szymon,
> 
> Thank you for the patch.
> 
> On Tue, Dec 06, 2022 at 03:13:01PM +0100, Szymon Heidrich wrote:
>> Setup function uvc_function_setup permits control transfer
>> requests with up to 64 bytes of payload (UVC_MAX_REQUEST_SIZE),
>> data stage handler for OUT transfer uses memcpy to copy req->actual
>> bytes to uvc_event->data.data array of size 60. This may result
>> in an overflow of 4 bytes.
>>
>> Fixes: cdda479f15cd ("USB gadget: video class function driver")
>> Signed-off-by: Szymon Heidrich <szymon.heidrich@gmail.com>
> 
> Good catch.
> 
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> 
>> ---
>> V1 -> V2: Corrected commit message and changed ?: in favor of min_t
>> V2 -> V3: Added fixes tag
>>
>>  drivers/usb/gadget/function/f_uvc.c | 5 +++--
>>  1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c
>> index 6e196e061..4419b7972 100644
>> --- a/drivers/usb/gadget/function/f_uvc.c
>> +++ b/drivers/usb/gadget/function/f_uvc.c
>> @@ -216,8 +216,9 @@ uvc_function_ep0_complete(struct usb_ep *ep, struct usb_request *req)
>>  
>>  		memset(&v4l2_event, 0, sizeof(v4l2_event));
>>  		v4l2_event.type = UVC_EVENT_DATA;
>> -		uvc_event->data.length = req->actual;
>> -		memcpy(&uvc_event->data.data, req->buf, req->actual);
>> +		uvc_event->data.length = min_t(unsigned int, req->actual,
>> +			sizeof(uvc_event->data.data));
>> +		memcpy(&uvc_event->data.data, req->buf, uvc_event->data.length);
>>  		v4l2_event_queue(&uvc->vdev, &v4l2_event);
>>  	}
>>  }
> 

Hello Dan and Laurent,

Thank you very much for your time, review and accurate remarks.

Best regards,
Szymon