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: [stable,3.18-4.9] xhci: Fix ring leak in failure path of xhci_alloc_virt_device() From: Greg KH Message-Id: <20180111171310.GA11641@kroah.com> Date: Thu, 11 Jan 2018 18:13:10 +0100 To: Ben Hutchings Cc: stable@vger.kernel.org, Mathias Nyman , linux-usb@vger.kernel.org List-ID: T24gVGh1LCBKYW4gMTEsIDIwMTggYXQgMDU6MDE6MzZQTSArMDAwMCwgQmVuIEh1dGNoaW5ncyB3 cm90ZToKPiBUaGlzIGlzIGEgc3RhYmxlLW9ubHkgZml4IGZvciB0aGUgYmFja3BvcnQgb2YgY29t bWl0IDVkOWI3MGY3ZDUyZQo+ICgieGhjaTogRG9uJ3QgYWRkIGEgdmlydF9kZXYgdG8gdGhlIGRl dnMgYXJyYXkgYmVmb3JlIGl0J3MgZnVsbHkKPiBhbGxvY2F0ZWQiKS4KPiAKPiBJbiBicmFuY2hl cyB0aGF0IHByZWRhdGUgY29tbWl0IGM1NjI4YTJhZjgzYSAoInhoY2k6IHJlbW92ZSBlbmRwb2lu dAo+IHJpbmcgY2FjaGUiKSB0aGVyZSBpcyBhbiBhZGRpdGlvbmFsIGZhaWx1cmUgcGF0aCBpbgo+ IHhoY2lfYWxsb2NfdmlydF9kZXZpY2UoKSB3aGVyZSByaW5nIGNhY2hlIGFsbG9jYXRpb24gZmFp bHMsIGluCj4gd2hpY2ggY2FzZSB3ZSBuZWVkIHRvIGZyZWUgdGhlIHJpbmcgYWxsb2NhdGVkIGZv ciBlbmRwb2ludCAwLgo+IAo+IFNpZ25lZC1vZmYtYnk6IEJlbiBIdXRjaGluZ3MgPGJlbi5odXRj aGluZ3NAY29kZXRoaW5rLmNvLnVrPgo+IC0tLQo+IFRoaXMgaXMgYnVpbGQtdGVzdGVkIG9ubHku CgpMb29rcyBnb29kIHRvIG1lLCB0aGFua3MgZm9yIHRoaXMhCgpNYXRoaWFzLCB5ZWxsIGlmIHlv dSB0aGluayBpdCdzIHdyb25nIDopCgpncmVnIGstaAotLS0KVG8gdW5zdWJzY3JpYmUgZnJvbSB0 aGlzIGxpc3Q6IHNlbmQgdGhlIGxpbmUgInVuc3Vic2NyaWJlIGxpbnV4LXVzYiIgaW4KdGhlIGJv ZHkgb2YgYSBtZXNzYWdlIHRvIG1ham9yZG9tb0B2Z2VyLmtlcm5lbC5vcmcKTW9yZSBtYWpvcmRv bW8gaW5mbyBhdCAgaHR0cDovL3ZnZXIua2VybmVsLm9yZy9tYWpvcmRvbW8taW5mby5odG1sCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out3-smtp.messagingengine.com ([66.111.4.27]:37819 "EHLO out3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751923AbeAKRNM (ORCPT ); Thu, 11 Jan 2018 12:13:12 -0500 Date: Thu, 11 Jan 2018 18:13:10 +0100 From: Greg KH To: Ben Hutchings Cc: stable@vger.kernel.org, Mathias Nyman , linux-usb@vger.kernel.org Subject: Re: [PATCH stable 3.18-4.9] xhci: Fix ring leak in failure path of xhci_alloc_virt_device() Message-ID: <20180111171310.GA11641@kroah.com> References: <20180111170136.abfqwdgvgapfiumn@xylophone.i.decadent.org.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180111170136.abfqwdgvgapfiumn@xylophone.i.decadent.org.uk> Sender: stable-owner@vger.kernel.org List-ID: On Thu, Jan 11, 2018 at 05:01:36PM +0000, Ben Hutchings wrote: > This is a stable-only fix for the backport of commit 5d9b70f7d52e > ("xhci: Don't add a virt_dev to the devs array before it's fully > allocated"). > > In branches that predate commit c5628a2af83a ("xhci: remove endpoint > ring cache") there is an additional failure path in > xhci_alloc_virt_device() where ring cache allocation fails, in > which case we need to free the ring allocated for endpoint 0. > > Signed-off-by: Ben Hutchings > --- > This is build-tested only. Looks good to me, thanks for this! Mathias, yell if you think it's wrong :) greg k-h