From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ob0-f182.google.com ([209.85.214.182]:44856 "EHLO mail-ob0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751478AbbAWXvO (ORCPT ); Fri, 23 Jan 2015 18:51:14 -0500 Received: by mail-ob0-f182.google.com with SMTP id gq1so249196obb.13 for ; Fri, 23 Jan 2015 15:51:14 -0800 (PST) Date: Fri, 23 Jan 2015 17:51:11 -0600 From: Bjorn Helgaas To: Michel =?iso-8859-1?Q?D=E4nzer?= Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Federico , dri-devel@lists.freedesktop.org Subject: Re: [PATCH v2] pci: Fix infinite loop with ROM image of size 0 Message-ID: <20150123235111.GX29776@google.com> References: <1421657600-31561-1-git-send-email-michel@daenzer.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 In-Reply-To: <1421657600-31561-1-git-send-email-michel@daenzer.net> Sender: linux-pci-owner@vger.kernel.org List-ID: On Mon, Jan 19, 2015 at 05:53:20PM +0900, Michel Dänzer wrote: > From: Michel Dänzer > > If the image size would ever read as 0, pci_get_rom_size could keep > processing the same image over and over again. > > Reported-by: Federico > Cc: stable@vger.kernel.org > Signed-off-by: Michel Dänzer Applied with Alex's ack to pci/resource for v3.20, thanks! > --- > > v2: > * Use unsigned instead of u16 for the local length variable (not sure if > the multiplication by 512 could overflow otherwise) > * Integrate length condition into while statement > * Add stable tag > > drivers/pci/rom.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c > index f955edb..eb0ad53 100644 > --- a/drivers/pci/rom.c > +++ b/drivers/pci/rom.c > @@ -71,6 +71,7 @@ size_t pci_get_rom_size(struct pci_dev *pdev, void __iomem *rom, size_t size) > { > void __iomem *image; > int last_image; > + unsigned length; > > image = rom; > do { > @@ -93,9 +94,9 @@ size_t pci_get_rom_size(struct pci_dev *pdev, void __iomem *rom, size_t size) > if (readb(pds + 3) != 'R') > break; > last_image = readb(pds + 21) & 0x80; > - /* this length is reliable */ > - image += readw(pds + 16) * 512; > - } while (!last_image); > + length = readw(pds + 16); > + image += length * 512; > + } while (length && !last_image); > > /* never return a size larger than the PCI resource window */ > /* there are known ROMs that get the size wrong */ > -- > 2.1.4 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bjorn Helgaas Subject: Re: [PATCH v2] pci: Fix infinite loop with ROM image of size 0 Date: Fri, 23 Jan 2015 17:51:11 -0600 Message-ID: <20150123235111.GX29776@google.com> References: <1421657600-31561-1-git-send-email-michel@daenzer.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-ob0-f181.google.com (mail-ob0-f181.google.com [209.85.214.181]) by gabe.freedesktop.org (Postfix) with ESMTP id 06D1B6E065 for ; Fri, 23 Jan 2015 15:51:14 -0800 (PST) Received: by mail-ob0-f181.google.com with SMTP id nt9so254964obb.12 for ; Fri, 23 Jan 2015 15:51:14 -0800 (PST) Content-Disposition: inline In-Reply-To: <1421657600-31561-1-git-send-email-michel@daenzer.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Michel =?iso-8859-1?Q?D=E4nzer?= Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Federico List-Id: dri-devel@lists.freedesktop.org T24gTW9uLCBKYW4gMTksIDIwMTUgYXQgMDU6NTM6MjBQTSArMDkwMCwgTWljaGVsIETDpG56ZXIg d3JvdGU6Cj4gRnJvbTogTWljaGVsIETDpG56ZXIgPG1pY2hlbC5kYWVuemVyQGFtZC5jb20+Cj4g Cj4gSWYgdGhlIGltYWdlIHNpemUgd291bGQgZXZlciByZWFkIGFzIDAsIHBjaV9nZXRfcm9tX3Np emUgY291bGQga2VlcAo+IHByb2Nlc3NpbmcgdGhlIHNhbWUgaW1hZ2Ugb3ZlciBhbmQgb3ZlciBh Z2Fpbi4KPiAKPiBSZXBvcnRlZC1ieTogRmVkZXJpY28gPGZlZGVyaWNvdGdAZ21haWwuY29tPgo+ IENjOiBzdGFibGVAdmdlci5rZXJuZWwub3JnCj4gU2lnbmVkLW9mZi1ieTogTWljaGVsIETDpG56 ZXIgPG1pY2hlbC5kYWVuemVyQGFtZC5jb20+CgpBcHBsaWVkIHdpdGggQWxleCdzIGFjayB0byBw Y2kvcmVzb3VyY2UgZm9yIHYzLjIwLCB0aGFua3MhCgo+IC0tLQo+IAo+IHYyOgo+ICogVXNlIHVu c2lnbmVkIGluc3RlYWQgb2YgdTE2IGZvciB0aGUgbG9jYWwgbGVuZ3RoIHZhcmlhYmxlIChub3Qg c3VyZSBpZgo+ICAgdGhlIG11bHRpcGxpY2F0aW9uIGJ5IDUxMiBjb3VsZCBvdmVyZmxvdyBvdGhl cndpc2UpCj4gKiBJbnRlZ3JhdGUgbGVuZ3RoIGNvbmRpdGlvbiBpbnRvIHdoaWxlIHN0YXRlbWVu dAo+ICogQWRkIHN0YWJsZSB0YWcKPiAKPiAgZHJpdmVycy9wY2kvcm9tLmMgfCA3ICsrKystLS0K PiAgMSBmaWxlIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKPiAKPiBk aWZmIC0tZ2l0IGEvZHJpdmVycy9wY2kvcm9tLmMgYi9kcml2ZXJzL3BjaS9yb20uYwo+IGluZGV4 IGY5NTVlZGIuLmViMGFkNTMgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9wY2kvcm9tLmMKPiArKysg Yi9kcml2ZXJzL3BjaS9yb20uYwo+IEBAIC03MSw2ICs3MSw3IEBAIHNpemVfdCBwY2lfZ2V0X3Jv bV9zaXplKHN0cnVjdCBwY2lfZGV2ICpwZGV2LCB2b2lkIF9faW9tZW0gKnJvbSwgc2l6ZV90IHNp emUpCj4gIHsKPiAgCXZvaWQgX19pb21lbSAqaW1hZ2U7Cj4gIAlpbnQgbGFzdF9pbWFnZTsKPiAr CXVuc2lnbmVkIGxlbmd0aDsKPiAgCj4gIAlpbWFnZSA9IHJvbTsKPiAgCWRvIHsKPiBAQCAtOTMs OSArOTQsOSBAQCBzaXplX3QgcGNpX2dldF9yb21fc2l6ZShzdHJ1Y3QgcGNpX2RldiAqcGRldiwg dm9pZCBfX2lvbWVtICpyb20sIHNpemVfdCBzaXplKQo+ICAJCWlmIChyZWFkYihwZHMgKyAzKSAh PSAnUicpCj4gIAkJCWJyZWFrOwo+ICAJCWxhc3RfaW1hZ2UgPSByZWFkYihwZHMgKyAyMSkgJiAw eDgwOwo+IC0JCS8qIHRoaXMgbGVuZ3RoIGlzIHJlbGlhYmxlICovCj4gLQkJaW1hZ2UgKz0gcmVh ZHcocGRzICsgMTYpICogNTEyOwo+IC0JfSB3aGlsZSAoIWxhc3RfaW1hZ2UpOwo+ICsJCWxlbmd0 aCA9IHJlYWR3KHBkcyArIDE2KTsKPiArCQlpbWFnZSArPSBsZW5ndGggKiA1MTI7Cj4gKwl9IHdo aWxlIChsZW5ndGggJiYgIWxhc3RfaW1hZ2UpOwo+ICAKPiAgCS8qIG5ldmVyIHJldHVybiBhIHNp emUgbGFyZ2VyIHRoYW4gdGhlIFBDSSByZXNvdXJjZSB3aW5kb3cgKi8KPiAgCS8qIHRoZXJlIGFy ZSBrbm93biBST01zIHRoYXQgZ2V0IHRoZSBzaXplIHdyb25nICovCj4gLS0gCj4gMi4xLjQKPiAK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK