From patchwork Thu Jun 14 13:29:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhouyang Jia X-Patchwork-Id: 10464127 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 80D33603B4 for ; Thu, 14 Jun 2018 13:29:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 71014285E5 for ; Thu, 14 Jun 2018 13:29:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 638FF28931; Thu, 14 Jun 2018 13:29:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C3B8285E5 for ; Thu, 14 Jun 2018 13:29:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755288AbeFNN3U (ORCPT ); Thu, 14 Jun 2018 09:29:20 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:36787 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755252AbeFNN3R (ORCPT ); Thu, 14 Jun 2018 09:29:17 -0400 Received: by mail-pl0-f67.google.com with SMTP id a7-v6so3563945plp.3; Thu, 14 Jun 2018 06:29:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Gk9vpMA1JXKxTPhEHh5XR6BLUoW/9jt7Va47frd5DNI=; b=tVQghfqs/6FWjU4ecjCFSmWb2yLRB44UAm6RsIcCG1fkNSoSwyRbxxtVTJhrC4VMUk gqjIgltWtiE20BXlaRVdRaqGwmG0E0dv2RY1ZqXSMA1wUfpTWLlM2GvrvaZmhpM5/sKp 8qDqRw+Gi7iTx3JHSi/3QhT3x5Ojf+oq3m+gHASRH27Xwp+jMWdTo2byyt3+MqqBsF8b LmeueVrwkooXLvEAPbuXtmmrTadK8NppT2elMpygDMi3zPXG5128NrXD7KNeCCyKYTNA NEVkyWxBi7qW7J42P086E2HG0SH5guJ3yAz1wc6IltAlycCsXwznZomCseFby9MPjC2t 4qnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Gk9vpMA1JXKxTPhEHh5XR6BLUoW/9jt7Va47frd5DNI=; b=h4ySJUrHEtk0Tuitr/KfARJCkIA3Uha5rUpV4giF69bIl0OmNZsbxaUOJv7U0mxiLs cu7JvXggwM7V2+Xk5f9pi0SQkkBQ82Rv84DMZYuJvPnnseYGuQXCh5MlSYJosqvY8/85 O6YaWtzEIH7Ol7Wt6pSh6TEjine/9bE7Bqwp2l1v2gzujUCnUgqAdoZS6acTMvtqEP9A MUPkX+0Hdj18lTqVIkF15m/EFplkDl/+oLcxZVMQD9VvuDui56GzJ6k0KVvN0ZwMVBhv 7LijDkTAJ3EzgOrzzeT3xAbXnUuh8KxFUuuMhGPEEC1FO39FhU4HC7ytphl8fd6KsycW lsSw== X-Gm-Message-State: APt69E3DrZXuqucTMQ2GKh7gfN+sRZtOEhBRHao01oe8uq8rAGW0umIh oMN0MJgKjltzgxVSbEtbNkE= X-Google-Smtp-Source: ADUXVKLjYpOz/gvBEWGlZajh68cGJaCDhmFZ02Is8eVCXK4AgjNesQbNzrP6fP+yQIkadA7i9sQ30g== X-Received: by 2002:a17:902:784d:: with SMTP id e13-v6mr3005731pln.197.1528982956606; Thu, 14 Jun 2018 06:29:16 -0700 (PDT) Received: from localhost ([103.88.46.82]) by smtp.gmail.com with ESMTPSA id t23-v6sm11041342pfa.86.2018.06.14.06.29.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Jun 2018 06:29:15 -0700 (PDT) From: Zhouyang Jia Cc: Zhouyang Jia , Alan Stern , Greg Kroah-Hartman , linux-usb@vger.kernel.org, usb-storage@lists.one-eyed-alien.net, linux-kernel@vger.kernel.org Subject: [PATCH v2] usb: storage: add error handling for kcalloc Date: Thu, 14 Jun 2018 21:29:11 +0800 Message-Id: <1528982951-52753-1-git-send-email-jiazhouyang09@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1528707147-35623-1-git-send-email-jiazhouyang09@gmail.com> References: <1528707147-35623-1-git-send-email-jiazhouyang09@gmail.com> To: unlisted-recipients:; (no To-header on input) Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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; if (alauda_reset_media(us) != USB_STOR_XFER_GOOD) return USB_STOR_TRANSPORT_ERROR;