From patchwork Wed Dec 30 16:01:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Insu Yun X-Patchwork-Id: 7934131 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C82CD9F32E for ; Wed, 30 Dec 2015 15:59:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1035A202C8 for ; Wed, 30 Dec 2015 15:59:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 414E020219 for ; Wed, 30 Dec 2015 15:59:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754110AbbL3P6z (ORCPT ); Wed, 30 Dec 2015 10:58:55 -0500 Received: from mail-yk0-f175.google.com ([209.85.160.175]:34235 "EHLO mail-yk0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752587AbbL3P6y (ORCPT ); Wed, 30 Dec 2015 10:58:54 -0500 Received: by mail-yk0-f175.google.com with SMTP id a85so81208518ykb.1; Wed, 30 Dec 2015 07:58:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=clLNB/GAD88IPwuGROaQvLrtJd8jpOd5UEdLC3HEkCY=; b=eaR8lcUNROAhYDcMGImBxqbH7iajOi7kG2I9YQw/FncbZgn1lR/Eo9mKik196X+kDV clLks1egZCY2iImQDvRz+jJWqy2e3Lb+kni/rNTiXVXwAYnJ+dOmlYB358mZzSH4+Dg9 U03vpd5Oh22Z8mjZp+ix4isW6wee7dYBmY6qQfg/kHcm/qVZ9t+E0WwnGRxSMQz43r6X mdtwcPnQE8738m9IrC3BckSWIrbADA8eAeBjYsQ8o1HswjGw91eXu4QWsSEmTnyb5VDw JNJm8HIuoTzzxs/Pm2ryTFu1ddMyXUiW5UZGYnv6O98nPsVli0USc3vgrqNmn4yXayLs d0Sw== X-Received: by 10.129.158.15 with SMTP id v15mr54709849ywg.236.1451491133808; Wed, 30 Dec 2015 07:58:53 -0800 (PST) Received: from cutthroat.gtisc.gatech.edu (cutthroat.gtisc.gatech.edu. [128.61.240.77]) by smtp.gmail.com with ESMTPSA id v70sm29084363ywa.30.2015.12.30.07.58.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Dec 2015 07:58:53 -0800 (PST) From: Insu Yun To: akarwar@marvell.com, nishants@marvell.com, kvalo@codeaurora.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: taesoo@gatech.edu, yeongjin.jang@gatech.edu, insu@gatech.edu, changwoo@gatech.edu, Insu Yun Subject: [PATCH v2] mwifiex: correctly handling kzalloc Date: Wed, 30 Dec 2015 11:01:44 -0500 Message-Id: <1451491304-35251-1-git-send-email-wuninsu@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since kzalloc can be failed in memory pressure, it needs to be handled, otherwise NULL dereference could be happened Signed-off-by: Insu Yun --- drivers/net/wireless/mwifiex/sdio.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c index 78a8474..a8af72d 100644 --- a/drivers/net/wireless/mwifiex/sdio.c +++ b/drivers/net/wireless/mwifiex/sdio.c @@ -2053,8 +2053,19 @@ static int mwifiex_init_sdio(struct mwifiex_adapter *adapter) /* Allocate skb pointer buffers */ card->mpa_rx.skb_arr = kzalloc((sizeof(void *)) * card->mp_agg_pkt_limit, GFP_KERNEL); + if (!card->mpa_rx.skb_arr) { + kfree(card->mp_regs); + return -ENOMEM; + } + card->mpa_rx.len_arr = kzalloc(sizeof(*card->mpa_rx.len_arr) * card->mp_agg_pkt_limit, GFP_KERNEL); + if (!card->mpa_rx.len_arr) { + kfree(card->mp_regs); + kfree(card->mpa_rx.skb_arr); + return -ENOMEM; + } + ret = mwifiex_alloc_sdio_mpa_buffers(adapter, card->mp_tx_agg_buf_size, card->mp_rx_agg_buf_size);