Received: by 2002:ac0:a581:0:0:0:0:0 with SMTP id m1-v6csp4018776imm; Mon, 25 Jun 2018 08:24:15 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLkm7/7Cwu71LrxlpOIOJ0MlzqCsCsoakmOaXUlEU2dses3B2Wh2H8CkC2gnbgCiM3T3N01 X-Received: by 2002:a17:902:b217:: with SMTP id t23-v6mr12975445plr.312.1529940255632; Mon, 25 Jun 2018 08:24:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529940255; cv=none; d=google.com; s=arc-20160816; b=k2l3Ec/rK13AAdKyAsCryKTjiB4g9GB1ITND+MoaUPBOqM6STb5+2X1W1OrFJUujRq Dtti5MEAjq8ueh70kLE5yWYlaOdPxt1lZdOJnx8OjWl9CpV3+hdK+RjXStWGLx7Y1SZ7 9bK+3UEHZFDvE9zMfmJzljeD6s1ea6JWltH4KB3R8XicAYA6c9gaeC5jkl0AKX/xuKXf L4H90oXiTnSyQ1oAhZ7GqX1TGT4okYSVoYsZ8rEiAAnphnDH3UuVqdRVKhEB/tApFTN4 gcCL+T/59la3XUKU+oQP7s7DKIbaN+7l7ZpSupRis3bMHAkAegzJup/MfKyhFpaH5E3s j4Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:in-reply-to :subject:cc:to:from:date:arc-authentication-results; bh=ZACKlvaJqYBUD54DHib6F6ik0dATBRkS9Wr4J364hCs=; b=SumdIhaMgRkoRA7WeB4Sy9QrPTFEEMUsX0d1p9nH31FUYh+oxOkjEs3OcEYhmGUlAm mCcKxXn9mIVEU4uoJ1PgWEU9tJ13/I6tarNfnE/En2y9SeExKZezNRqVpQ3hbDhjzerF 4Uv+kJW/EPbHhnhBjCcSXvcuUyLJodXBNDtPLXuTKUhSSButCu9GHVNPk7NNlIncDbHp HUkWcpOKxS4wbefVJEUoBtvehc96Z+ll3okVoUe0JkvsF8x+HGzu20gjYzlH03fHw7Ye YEhDpHZ7ge+F5fTqHEOc41EzYhLrdVVof8Hg7OptPjzrOR0YKrWXrvE1wVJRaBjHDHvP F/mA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 22-v6si14600554pfh.308.2018.06.25.08.24.01; Mon, 25 Jun 2018 08:24:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934910AbeFYPWi (ORCPT + 99 others); Mon, 25 Jun 2018 11:22:38 -0400 Received: from iolanthe.rowland.org ([192.131.102.54]:37136 "HELO iolanthe.rowland.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S934743AbeFYPWf (ORCPT ); Mon, 25 Jun 2018 11:22:35 -0400 Received: (qmail 3270 invoked by uid 2102); 25 Jun 2018 11:22:34 -0400 Received: from localhost (sendmail-bs@127.0.0.1) by localhost with SMTP; 25 Jun 2018 11:22:34 -0400 Date: Mon, 25 Jun 2018 11:22:34 -0400 (EDT) From: Alan Stern X-X-Sender: stern@iolanthe.rowland.org To: Greg Kroah-Hartman cc: Zhouyang Jia , , , Subject: Re: [PATCH v2] usb: storage: add error handling for kcalloc In-Reply-To: <20180625123326.GA14987@kroah.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 25 Jun 2018, Greg Kroah-Hartman wrote: > 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 :( That's not really true. The memory gets deallocated later on in any case, when alauda_info_destructor() calls alauda_free_maps() if not before. More troubling is the fact that this routine (i.e, alauda_init_media) gets called from only one place, in alauda_check_media, and the caller completely ignores the return value! Furthermore, the caller always returns USB_STOR_TRANSPORT_FAILED. So on the whole, I don't think this patch is going to make any difference to the driver's operation. Alan Stern