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: [v2] usb: storage: add error handling for kcalloc From: Greg Kroah-Hartman Message-Id: <20180625123326.GA14987@kroah.com> Date: Mon, 25 Jun 2018 20:33:26 +0800 To: Zhouyang Jia Cc: Alan Stern , linux-usb@vger.kernel.org, usb-storage@lists.one-eyed-alien.net, linux-kernel@vger.kernel.org List-ID: T24gVGh1LCBKdW4gMTQsIDIwMTggYXQgMDk6Mjk6MTFQTSArMDgwMCwgWmhvdXlhbmcgSmlhIHdy b3RlOgo+IFdoZW4ga2NhbGxvYyBmYWlscywgdGhlIGxhY2sgb2YgZXJyb3ItaGFuZGxpbmcgY29k ZSBtYXkKPiBjYXVzZSB1bmV4cGVjdGVkIHJlc3VsdHMuCj4gCj4gVGhpcyBwYXRjaCBhZGRzIGVy cm9yLWhhbmRsaW5nIGNvZGUgYWZ0ZXIgY2FsbGluZyBrY2FsbG9jLgo+IAo+IFNpZ25lZC1vZmYt Ynk6IFpob3V5YW5nIEppYSA8amlhemhvdXlhbmcwOUBnbWFpbC5jb20+Cj4gQWNrZWQtYnk6IEFs YW4gU3Rlcm4gPHN0ZXJuQHJvd2xhbmQuaGFydmFyZC5lZHU+Cj4gLS0tCj4gdjEtPnYyOgo+IC0g UmVtb3ZlIHByX3dhcm4gc3RhdGVtZW50Lgo+IC0tLQo+ICBkcml2ZXJzL3VzYi9zdG9yYWdlL2Fs YXVkYS5jIHwgMyArKysKPiAgMSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKQo+IAo+IGRp ZmYgLS1naXQgYS9kcml2ZXJzL3VzYi9zdG9yYWdlL2FsYXVkYS5jIGIvZHJpdmVycy91c2Ivc3Rv cmFnZS9hbGF1ZGEuYwo+IGluZGV4IDkwMDU5MWQuLjRlMTc2MDkgMTAwNjQ0Cj4gLS0tIGEvZHJp dmVycy91c2Ivc3RvcmFnZS9hbGF1ZGEuYwo+ICsrKyBiL2RyaXZlcnMvdXNiL3N0b3JhZ2UvYWxh dWRhLmMKPiBAQCAtNDM3LDYgKzQzNyw5IEBAIHN0YXRpYyBpbnQgYWxhdWRhX2luaXRfbWVkaWEo c3RydWN0IHVzX2RhdGEgKnVzKQo+ICAJCSsgTUVESUFfSU5GTyh1cykuYmxvY2tzaGlmdCArIE1F RElBX0lORk8odXMpLnBhZ2VzaGlmdCk7Cj4gIAlNRURJQV9JTkZPKHVzKS5wYmFfdG9fbGJhID0g a2NhbGxvYyhudW1fem9uZXMsIHNpemVvZih1MTYqKSwgR0ZQX05PSU8pOwo+ICAJTUVESUFfSU5G Tyh1cykubGJhX3RvX3BiYSA9IGtjYWxsb2MobnVtX3pvbmVzLCBzaXplb2YodTE2KiksIEdGUF9O T0lPKTsKPiArCWlmICgoTUVESUFfSU5GTyh1cykucGJhX3RvX2xiYSA9PSBOVUxMKQo+ICsJCXx8 IChNRURJQV9JTkZPKHVzKS5sYmFfdG9fcGJhID09IE5VTEwpKQo+ICsJCXJldHVybiBVU0JfU1RP Ul9UUkFOU1BPUlRfRVJST1I7CgpZb3UganVzdCBsZWFrZWQgbWVtb3J5IGlmIG9ubHkgb25lIG9m IHRoZXNlIHN1Y2NlZWRlZCA6KAotLS0KVG8gdW5zdWJzY3JpYmUgZnJvbSB0aGlzIGxpc3Q6IHNl bmQgdGhlIGxpbmUgInVuc3Vic2NyaWJlIGxpbnV4LXVzYiIgaW4KdGhlIGJvZHkgb2YgYSBtZXNz YWdlIHRvIG1ham9yZG9tb0B2Z2VyLmtlcm5lbC5vcmcKTW9yZSBtYWpvcmRvbW8gaW5mbyBhdCAg aHR0cDovL3ZnZXIua2VybmVsLm9yZy9tYWpvcmRvbW8taW5mby5odG1sCg== 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=-2.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,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 31567C43144 for ; Mon, 25 Jun 2018 12:33:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D524221A6F for ; Mon, 25 Jun 2018 12:33:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D524221A6F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933772AbeFYMdg (ORCPT ); Mon, 25 Jun 2018 08:33:36 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:46292 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932404AbeFYMde (ORCPT ); Mon, 25 Jun 2018 08:33:34 -0400 Received: from localhost (li1825-44.members.linode.com [172.104.248.44]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 916B4C9E; Mon, 25 Jun 2018 12:33:31 +0000 (UTC) Date: Mon, 25 Jun 2018 20:33:26 +0800 From: Greg Kroah-Hartman To: Zhouyang Jia Cc: Alan Stern , linux-usb@vger.kernel.org, usb-storage@lists.one-eyed-alien.net, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] usb: storage: add error handling for kcalloc Message-ID: <20180625123326.GA14987@kroah.com> References: <1528707147-35623-1-git-send-email-jiazhouyang09@gmail.com> <1528982951-52753-1-git-send-email-jiazhouyang09@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1528982951-52753-1-git-send-email-jiazhouyang09@gmail.com> User-Agent: Mutt/1.10.0 (2018-05-17) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jun 14, 2018 at 09:29:11PM +0800, Zhouyang Jia wrote: > When kcalloc fails, the lack of error-handling code may > cause unexpected results. > > This patch adds error-handling code after calling kcalloc. > > Signed-off-by: Zhouyang Jia > Acked-by: Alan Stern > --- > v1->v2: > - Remove pr_warn statement. > --- > drivers/usb/storage/alauda.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/usb/storage/alauda.c b/drivers/usb/storage/alauda.c > index 900591d..4e17609 100644 > --- a/drivers/usb/storage/alauda.c > +++ b/drivers/usb/storage/alauda.c > @@ -437,6 +437,9 @@ static int alauda_init_media(struct us_data *us) > + MEDIA_INFO(us).blockshift + MEDIA_INFO(us).pageshift); > MEDIA_INFO(us).pba_to_lba = kcalloc(num_zones, sizeof(u16*), GFP_NOIO); > MEDIA_INFO(us).lba_to_pba = kcalloc(num_zones, sizeof(u16*), GFP_NOIO); > + if ((MEDIA_INFO(us).pba_to_lba == NULL) > + || (MEDIA_INFO(us).lba_to_pba == NULL)) > + return USB_STOR_TRANSPORT_ERROR; You just leaked memory if only one of these succeeded :(