From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7BF674449C for ; Fri, 6 Oct 2023 22:11:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=none Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [IPv6:2a0a:edc0:2:b01:1d::104]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E4E4CCF for ; Fri, 6 Oct 2023 15:11:13 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qot2L-00036p-GK; Sat, 07 Oct 2023 00:11:09 +0200 Received: from [2a0a:edc0:2:b01:1d::c5] (helo=pty.whiteo.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qot2K-00Bcel-VG; Sat, 07 Oct 2023 00:11:08 +0200 Received: from mgr by pty.whiteo.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qot2K-00Gj2M-Lv; Sat, 07 Oct 2023 00:11:08 +0200 Date: Sat, 7 Oct 2023 00:11:08 +0200 From: Michael Grzeschik To: Avichal Rakesh Cc: dan.scally@ideasonboard.com, gregkh@linuxfoundation.org, laurent.pinchart@ideasonboard.com, etalvala@google.com, jchowdhary@google.com, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Subject: Re: [PATCH v3 2/3] usb: gadget: uvc: Allocate uvc_requests one at a time Message-ID: References: <20230930184821.310143-1-arakesh@google.com> <20231005180814.3278050-1-arakesh@google.com> <20231005180814.3278050-2-arakesh@google.com> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="Ef3RzvolJfkDMu+D" Content-Disposition: inline In-Reply-To: <20231005180814.3278050-2-arakesh@google.com> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: mgr@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-usb@vger.kernel.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net --Ef3RzvolJfkDMu+D Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Oct 05, 2023 at 11:08:13AM -0700, Avichal Rakesh wrote: >Currently, the uvc gadget driver allocates all uvc_requests as one array >and deallocates them all when the video stream stops. This includes >de-allocating all the usb_requests associated with those uvc_requests. >This can lead to use-after-free issues if any of those de-allocated >usb_requests were still owned by the usb controller. > >This patch is 1 of 2 patches addressing the use-after-free issue. >Instead of bulk allocating all uvc_requests as an array, this patch >allocates uvc_requests one at a time, which should allows for similar >granularity when deallocating the uvc_requests. This patch has no >functional changes other than allocating each uvc_request separately, >and similarly freeing each of them separately. > >Link: https://lore.kernel.org/7cd81649-2795-45b6-8c10-b7df1055020d@google.= com >Suggested-by: Michael Grzeschik Please use my full address here. m.grzeschik@pengutronix.de >Signed-off-by: Avichal Rakesh >--- >v1 -> v2: Rebased to ToT >V2 -> V3: Fix email threading goof-up > > drivers/usb/gadget/function/uvc.h | 3 +- > drivers/usb/gadget/function/uvc_video.c | 90 ++++++++++++++----------- > 2 files changed, 51 insertions(+), 42 deletions(-) > >diff --git a/drivers/usb/gadget/function/uvc.h b/drivers/usb/gadget/functi= on/uvc.h >index 989bc6b4e93d..993694da0bbc 100644 >--- a/drivers/usb/gadget/function/uvc.h >+++ b/drivers/usb/gadget/function/uvc.h >@@ -81,6 +81,7 @@ struct uvc_request { > struct sg_table sgt; > u8 header[UVCG_REQUEST_HEADER_LEN]; > struct uvc_buffer *last_buf; >+ struct list_head list; > }; > > struct uvc_video { >@@ -102,7 +103,7 @@ struct uvc_video { > > /* Requests */ > unsigned int req_size; >- struct uvc_request *ureq; >+ struct list_head ureqs; /* all uvc_requests allocated by uvc_video */ > struct list_head req_free; > spinlock_t req_lock; > >diff --git a/drivers/usb/gadget/function/uvc_video.c b/drivers/usb/gadget/= function/uvc_video.c >index 97d875c27dcf..3c4d286d81c0 100644 >--- a/drivers/usb/gadget/function/uvc_video.c >+++ b/drivers/usb/gadget/function/uvc_video.c >@@ -227,6 +227,23 @@ uvc_video_encode_isoc(struct usb_request *req, struct= uvc_video *video, > * Request handling > */ > >+static void uvc_video_free_request(struct uvc_request *ureq, struct usb_e= p *ep) >+{ >+ sg_free_table(&ureq->sgt); >+ if (ureq->req && ep) { >+ usb_ep_free_request(ep, ureq->req); >+ ureq->req =3D NULL; >+ } >+ >+ kfree(ureq->req_buffer); >+ ureq->req_buffer =3D NULL; >+ >+ if (!list_empty(&ureq->list)) >+ list_del_init(&ureq->list); >+ >+ kfree(ureq); >+} >+ > static int uvcg_video_ep_queue(struct uvc_video *video, struct usb_reques= t *req) > { > int ret; >@@ -299,27 +316,13 @@ uvc_video_complete(struct usb_ep *ep, struct usb_req= uest *req) > static int > uvc_video_free_requests(struct uvc_video *video) > { >- unsigned int i; >- >- if (video->ureq) { >- for (i =3D 0; i < video->uvc_num_requests; ++i) { >- sg_free_table(&video->ureq[i].sgt); >- >- if (video->ureq[i].req) { >- usb_ep_free_request(video->ep, video->ureq[i].req); >- video->ureq[i].req =3D NULL; >- } >+ struct uvc_request *ureq, *temp; > >- if (video->ureq[i].req_buffer) { >- kfree(video->ureq[i].req_buffer); >- video->ureq[i].req_buffer =3D NULL; >- } >- } >- >- kfree(video->ureq); >- video->ureq =3D NULL; >+ list_for_each_entry_safe(ureq, temp, &video->ureqs, list) { >+ uvc_video_free_request(ureq, video->ep); > } Please drop the extra braces. > >+ INIT_LIST_HEAD(&video->ureqs); > INIT_LIST_HEAD(&video->req_free); > video->req_size =3D 0; > return 0; >@@ -328,6 +331,7 @@ uvc_video_free_requests(struct uvc_video *video) > static int > uvc_video_alloc_requests(struct uvc_video *video) > { >+ struct uvc_request *ureq; > unsigned int req_size; > unsigned int i; > int ret =3D -ENOMEM; >@@ -338,29 +342,31 @@ uvc_video_alloc_requests(struct uvc_video *video) > * max_t(unsigned int, video->ep->maxburst, 1) > * (video->ep->mult); > >- video->ureq =3D kcalloc(video->uvc_num_requests, sizeof(struct uvc_reque= st), GFP_KERNEL); >- if (video->ureq =3D=3D NULL) >- return -ENOMEM; >- >- for (i =3D 0; i < video->uvc_num_requests; ++i) { >- video->ureq[i].req_buffer =3D kmalloc(req_size, GFP_KERNEL); >- if (video->ureq[i].req_buffer =3D=3D NULL) >+ INIT_LIST_HEAD(&video->ureqs); >+ for (i =3D 0; i < video->uvc_num_requests; i++) { >+ ureq =3D kzalloc(sizeof(struct uvc_request), GFP_KERNEL); >+ if (ureq =3D=3D NULL) > goto error; >+ INIT_LIST_HEAD(&ureq->list); >+ list_add_tail(&ureq->list, &video->ureqs); >+ } > >- video->ureq[i].req =3D usb_ep_alloc_request(video->ep, GFP_KERNEL); >- if (video->ureq[i].req =3D=3D NULL) >+ list_for_each_entry(ureq, &video->ureqs, list) { >+ ureq->req_buffer =3D kmalloc(req_size, GFP_KERNEL); >+ if (ureq->req_buffer =3D=3D NULL) > goto error; >- Instead of looping twice. Wouldn't it be possible to fill the just created ureq from the for loop here directly. >- video->ureq[i].req->buf =3D video->ureq[i].req_buffer; >- video->ureq[i].req->length =3D 0; >- video->ureq[i].req->complete =3D uvc_video_complete; >- video->ureq[i].req->context =3D &video->ureq[i]; >- video->ureq[i].video =3D video; >- video->ureq[i].last_buf =3D NULL; >- >- list_add_tail(&video->ureq[i].req->list, &video->req_free); >+ ureq->req =3D usb_ep_alloc_request(video->ep, GFP_KERNEL); >+ if (ureq->req =3D=3D NULL) >+ goto error; >+ ureq->req->buf =3D ureq->req_buffer; >+ ureq->req->length =3D 0; >+ ureq->req->complete =3D uvc_video_complete; >+ ureq->req->context =3D ureq; >+ ureq->video =3D video; >+ ureq->last_buf =3D NULL; Add an extra spare line just like in the code before. >+ list_add_tail(&ureq->req->list, &video->req_free); > /* req_size/PAGE_SIZE + 1 for overruns and + 1 for header */ >- sg_alloc_table(&video->ureq[i].sgt, >+ sg_alloc_table(&ureq->sgt, > DIV_ROUND_UP(req_size - UVCG_REQUEST_HEADER_LEN, > PAGE_SIZE) + 2, GFP_KERNEL); > } >@@ -504,7 +510,7 @@ static void uvcg_video_pump(struct work_struct *work) > int uvcg_video_enable(struct uvc_video *video, int enable) > { > struct uvc_device *uvc =3D video->uvc; >- unsigned int i; >+ struct uvc_request *ureq; > int ret; > > if (video->ep =3D=3D NULL) { >@@ -519,9 +525,10 @@ int uvcg_video_enable(struct uvc_video *video, int en= able) > cancel_work_sync(&video->pump); > uvcg_queue_cancel(&video->queue, 0); > >- for (i =3D 0; i < video->uvc_num_requests; ++i) >- if (video->ureq && video->ureq[i].req) >- usb_ep_dequeue(video->ep, video->ureq[i].req); >+ list_for_each_entry(ureq, &video->ureqs, list) { >+ if (ureq->req) >+ usb_ep_dequeue(video->ep, ureq->req); >+ } > > uvc_video_free_requests(video); > uvcg_queue_enable(&video->queue, 0); >@@ -555,6 +562,7 @@ int uvcg_video_enable(struct uvc_video *video, int ena= ble) > */ > int uvcg_video_init(struct uvc_video *video, struct uvc_device *uvc) > { >+ INIT_LIST_HEAD(&video->ureqs); > INIT_LIST_HEAD(&video->req_free); > spin_lock_init(&video->req_lock); > INIT_WORK(&video->pump, uvcg_video_pump); >-- >2.42.0.609.gbb76f46606-goog > --=20 Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | --Ef3RzvolJfkDMu+D Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEElXvEUs6VPX6mDPT8C+njFXoeLGQFAmUghfoACgkQC+njFXoe LGTJtg/+OUPWJt59T9LfxBKbd/Tkma52uWhfcaAVFsi9sMlQjb8Gs004JxhVVl+A MfxolWuJOWxF8o4aT3mTqfEKjKF1DkeFR+U/IUg9yEkgReLEOACJ6CgfFLXmwAAm zi4WmFJ2U9iQ5KunfBWCcHtaXREvA8beEXXBij5E/V3hZwv6tK23MKij01jtjEB1 hF2Bt/Ryzaqz43kX1veYuLRXtGE3vppBPdz18tBFXndCdXy4Myzt3LeuJh/iCK5i gzfgNh/rXf22sbkMhRyfdSGSu24bFA62QoL6QTlO2+Yg+s7nbA7Y+lOE8wvDPOT9 +9INghUKr4XYGCD4s+8QH+dyz+R9NlfOMGGz3nycH7E6fSvRYecOMKDHGjcDoMy2 QV+WppcaFXqPdYYtBr86fK0/h57lBiIp8fScWTlpRZfJfDIR4WspXFHKz6rt102S KnnVCg/bHvP5BiQlJvqC4hj4nprs0ApSGfUY/xgfhqK3RDMwc1UJqpGY5y+7+bB6 e089uh6tryy3+Fuou4UT7bd0UR0vL8wex4WnadpT/mJ/MTMLxh4pEQ2laVtovWch 3s4fBOizsHTXzFobBGiZ0my2jVwdRjYwTFMi8ruJl9afE7v8qDq8Y8iQ+IwX+mdh rLoFhbe6PQXw6jlkxAbHSBsEizKRUBKUSy3RC3wimu/r/H5u0A8= =Qw1y -----END PGP SIGNATURE----- --Ef3RzvolJfkDMu+D--