From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: r8a66597: Fix a possible concurrency use-after-free bug in r8a66597_endpoint_disable() From: Greg Kroah-Hartman Message-Id: <20181218111149.GA979@kroah.com> Date: Tue, 18 Dec 2018 12:11:49 +0100 To: Jia-Ju Bai Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org List-ID: T24gVHVlLCBEZWMgMTgsIDIwMTggYXQgMDY6MDA6MjBQTSArMDgwMCwgSmlhLUp1IEJhaSB3cm90 ZToKPiBUaGUgZnVuY3Rpb24gcjhhNjY1OTdfZW5kcG9pbnRfZGlzYWJsZSgpIGFuZCByOGE2NjU5 N191cmJfZW5xdWV1ZSgpIG1heQo+IGJlIGNvbmN1cnJlbnRseSBleGVjdXRlZC4KPiBUaGUgdHdv IGZ1bmN0aW9ucyBib3RoIGFjY2VzcyBhIHBvc3NpYmxlIHNoYXJlZCB2YXJpYWJsZSAiaGVwLT5o Y3ByaXYiLgo+IAo+IFRoaXMgc2hhcmVkIHZhcmlhYmxlIGlzIGZyZWVkIGJ5IHI4YTY2NTk3X2Vu ZHBvaW50X2Rpc2FibGUoKSB2aWEgdGhlCj4gY2FsbCBwYXRoOgo+IHI4YTY2NTk3X2VuZHBvaW50 X2Rpc2FibGUKPiAgIGtmcmVlKGhlcC0+aGNwcml2KSAobGluZSAxOTk1IGluIExpbnV4LTQuMTkp Cj4gCj4gVGhpcyB2YXJpYWJsZSBpcyByZWFkIGJ5IHI4YTY2NTk3X3VyYl9lbnF1ZXVlKCkgdmlh IHRoZSBjYWxsIHBhdGg6Cj4gcjhhNjY1OTdfdXJiX2VucXVldWUKPiAgIHNwaW5fbG9ja19pcnFz YXZlKCZyOGE2NjU5Ny0+bG9jayk7Cj4gICBpbml0X3BpcGVfaW5mbwo+ICAgICBlbmFibGVfcjhh NjY1OTdfcGlwZQo+ICAgICAgIHBpcGUgPSBoZXAtPmhjcHJpdiAobGluZSA4MDIgaW4gTGludXgt NC4xOSkKPiAKPiBUaGUgcmVhZCBvcGVyYXRpb24gaXMgcHJvdGVjdGVkIGJ5IGEgc3BpbmxvY2ss IGJ1dCB0aGUgZnJlZSBvcGVyYXRpb24KPiBpcyBub3QgcHJvdGVjdGVkIGJ5IHRoaXMgc3Bpbmxv Y2ssIHRodXMgYSBjb25jdXJyZW5jeSB1c2UtYWZ0ZXItZnJlZSBidWcKPiBtYXkgb2NjdXIuCj4g Cj4gVG8gZml4IHRoaXMgYnVnLCB0aGUgc3Bpbi1sb2NrIGFuZCBzcGluLXVubG9jayBmdW5jdGlv biBjYWxscyBpbgo+IHI4YTY2NTk3X2VuZHBvaW50X2Rpc2FibGUoKSBhcmUgbW92ZWQgdG8gcHJv dGVjdCB0aGUgZnJlZSBvcGVyYXRpb24uCj4gCj4gU2lnbmVkLW9mZi1ieTogSmlhLUp1IEJhaSA8 YmFpamlhanUxOTkwQGdtYWlsLmNvbT4KPiAtLS0KPiAgZHJpdmVycy91c2IvaG9zdC9yOGE2NjU5 Ny1oY2QuYyB8IDMgKystCj4gIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDEgZGVs ZXRpb24oLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2IvaG9zdC9yOGE2NjU5Ny1oY2Qu YyBiL2RyaXZlcnMvdXNiL2hvc3QvcjhhNjY1OTctaGNkLmMKPiBpbmRleCA5ODQ4OTJkZDcyZjUu LjE0OTVjZTE0YWQyMiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL3VzYi9ob3N0L3I4YTY2NTk3LWhj ZC5jCj4gKysrIGIvZHJpdmVycy91c2IvaG9zdC9yOGE2NjU5Ny1oY2QuYwo+IEBAIC0xOTkxLDEz ICsxOTkxLDE0IEBAIHN0YXRpYyB2b2lkIHI4YTY2NTk3X2VuZHBvaW50X2Rpc2FibGUoc3RydWN0 IHVzYl9oY2QgKmhjZCwKPiAgCQlyZXR1cm47Cj4gIAlwaXBlbnVtID0gcGlwZS0+aW5mby5waXBl bnVtOwo+ICAKPiArCXNwaW5fbG9ja19pcnFzYXZlKCZyOGE2NjU5Ny0+bG9jaywgZmxhZ3MpOwoK RG9uJ3QgeW91IGFsc28gbmVlZCB0aGUgX19hcXVpcmVzL19fcmVsZWFzZXMgbWFya2luZ3Mgb24g dGhpcyBmdW5jdGlvbgppbiBvcmRlciB0byBwcm9wZXJseSBhbm5vdGF0ZSBpdCwgbGlrZSB0aGUg cmVzdCBvZiB0aGUgZHJpdmVyIGhhcz8KCk90aGVyd2lzZSB0aGlzIHNlZW1zIHRvIGxvb2sgZ29v ZCB0byBtZS4KCnRoYW5rcywKCmdyZWcgay1oCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F79AC43387 for ; Tue, 18 Dec 2018 11:11:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 626692184C for ; Tue, 18 Dec 2018 11:11:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545131514; bh=xU+tvzQlXqSCsQ2lxQTIc4gTZWJ+tfh7mNnYBB0EEPY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=Zr25y2mk0gI3FmM3RcKOSQHGEbeiWMbaB8x/P7RQ2FHS3iGl8h9A0WbXG8aYHaKen pTv6n7qSHFFOi/5DrKmduyAoJI8hmh2ERtmgfd7g2zZkSKRc3xMIq3PPBYL0FyKgHg x0+wVSy8zvOR88WCxs1dzVnc0PdO+ZcRzqNLIM+M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726553AbeLRLLx (ORCPT ); Tue, 18 Dec 2018 06:11:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:52350 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726341AbeLRLLw (ORCPT ); Tue, 18 Dec 2018 06:11:52 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 894652184C; Tue, 18 Dec 2018 11:11:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545131512; bh=xU+tvzQlXqSCsQ2lxQTIc4gTZWJ+tfh7mNnYBB0EEPY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=nwLW9/TR+UsczpbCs2Lfubp5yymukaxGjlRByNvSvMQvt18+e9tmoeBhpejRQObuJ wC+vFoCl+Tofs0HkilJc1cEaMUcY79aBhZlXytis4nLt9oQGJAp/Ko7aNYxsER3IAQ Vc1tGda53CvWhfLb1SNq9ZV7RSa5QAMLZLC+E00U= Date: Tue, 18 Dec 2018 12:11:49 +0100 From: Greg KH To: Jia-Ju Bai Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] r8a66597: Fix a possible concurrency use-after-free bug in r8a66597_endpoint_disable() Message-ID: <20181218111149.GA979@kroah.com> References: <20181218100020.26250-1-baijiaju1990@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181218100020.26250-1-baijiaju1990@gmail.com> User-Agent: Mutt/1.11.1 (2018-12-01) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Dec 18, 2018 at 06:00:20PM +0800, Jia-Ju Bai wrote: > The function r8a66597_endpoint_disable() and r8a66597_urb_enqueue() may > be concurrently executed. > The two functions both access a possible shared variable "hep->hcpriv". > > This shared variable is freed by r8a66597_endpoint_disable() via the > call path: > r8a66597_endpoint_disable > kfree(hep->hcpriv) (line 1995 in Linux-4.19) > > This variable is read by r8a66597_urb_enqueue() via the call path: > r8a66597_urb_enqueue > spin_lock_irqsave(&r8a66597->lock); > init_pipe_info > enable_r8a66597_pipe > pipe = hep->hcpriv (line 802 in Linux-4.19) > > The read operation is protected by a spinlock, but the free operation > is not protected by this spinlock, thus a concurrency use-after-free bug > may occur. > > To fix this bug, the spin-lock and spin-unlock function calls in > r8a66597_endpoint_disable() are moved to protect the free operation. > > Signed-off-by: Jia-Ju Bai > --- > drivers/usb/host/r8a66597-hcd.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c > index 984892dd72f5..1495ce14ad22 100644 > --- a/drivers/usb/host/r8a66597-hcd.c > +++ b/drivers/usb/host/r8a66597-hcd.c > @@ -1991,13 +1991,14 @@ static void r8a66597_endpoint_disable(struct usb_hcd *hcd, > return; > pipenum = pipe->info.pipenum; > > + spin_lock_irqsave(&r8a66597->lock, flags); Don't you also need the __aquires/__releases markings on this function in order to properly annotate it, like the rest of the driver has? Otherwise this seems to look good to me. thanks, greg k-h