From patchwork Thu Jul 23 23:55:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaehyun Lim X-Patchwork-Id: 6856571 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BC37AC05AC for ; Thu, 23 Jul 2015 23:56:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ECE7620694 for ; Thu, 23 Jul 2015 23:56:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DEE9C20601 for ; Thu, 23 Jul 2015 23:56:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752819AbbGWX4K (ORCPT ); Thu, 23 Jul 2015 19:56:10 -0400 Received: from mail-pd0-f174.google.com ([209.85.192.174]:34420 "EHLO mail-pd0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752218AbbGWX4J (ORCPT ); Thu, 23 Jul 2015 19:56:09 -0400 Received: by pdbbh15 with SMTP id bh15so3834533pdb.1 for ; Thu, 23 Jul 2015 16:56:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=muN2eAMHLS5bdTl4EkICM8E4x03Hrhnqr5ChYOvnhVo=; b=fHFwzAmtpw5oNQPUBLee8QVWYOhTL0OH2dVw+MutsBd5lXOnFAq7WjzbMM1hj8JtaT AQpxuVChHdzzpZYIwTUZiV4lvhfQRkAMQKYd0YxvBqW6VdrcVCbBFjZsrDQiNN5Db7c2 5tSSC2r0U/b1WXI77rGYTyqPsZjdNwgYt2hexDgSugvcuJGZ1FWLOC9AUX5sqj9kGKmB 8RGZhRW+P2/9MWZbZkbEt2WLWHTKYGTu+9q2drCoYM+GuR3GKWoUK9nRnnlJz5vh1dbA v+TFy90CvexT/ND0P3nKYeHGMWnG4R8wINQUpCtUD+iK0C6O/0XxRmvQjirX48cCFShd 8nPA== X-Received: by 10.66.160.1 with SMTP id xg1mr19760272pab.27.1437695769259; Thu, 23 Jul 2015 16:56:09 -0700 (PDT) Received: from localhost.localdomain ([218.233.16.2]) by smtp.gmail.com with ESMTPSA id r9sm6649481pdp.5.2015.07.23.16.56.06 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 23 Jul 2015 16:56:08 -0700 (PDT) From: Chaehyun Lim To: gregkh@linuxfoundation.org Cc: johnny.kim@atmel.com, rachel.kim@atmel.com, dean.lee@atmel.com, chris.park@atmel.com, linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org, Chaehyun Lim Subject: [PATCH V3 3/3] staging: wilc1000: coreconfigurator.c: fix kmalloc error check Date: Fri, 24 Jul 2015 08:55:55 +0900 Message-Id: <1437695755-9731-3-git-send-email-chaehyun.lim@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1437695755-9731-1-git-send-email-chaehyun.lim@gmail.com> References: <1437695755-9731-1-git-send-email-chaehyun.lim@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-8.0 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 Return -ENOMEM if memory allocation is failed. Signed-off-by: Chaehyun Lim --- V2: Use ! operator instead of NULL comparison V3: this patch is rebased by previous modification drivers/staging/wilc1000/coreconfigurator.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c index 0ff9705..b2abd8b 100644 --- a/drivers/staging/wilc1000/coreconfigurator.c +++ b/drivers/staging/wilc1000/coreconfigurator.c @@ -675,11 +675,8 @@ s32 CoreConfiguratorInit(void) sema_init(&SemHandlePktResp, 0); gps8ConfigPacket = kmalloc(MAX_PACKET_BUFF_SIZE, GFP_KERNEL); - if (gps8ConfigPacket == NULL) { - PRINT_ER("failed in gps8ConfigPacket allocation\n"); - s32Error = WILC_NO_MEM; - goto _fail_; - } + if (!gps8ConfigPacket) + return -ENOMEM; WILC_memset((void *)gps8ConfigPacket, 0, MAX_PACKET_BUFF_SIZE); @@ -1032,10 +1029,8 @@ s32 ParseSurveyResults(u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZ pstrSurveyResults = kmalloc_array(u32SurveyResultsCount, sizeof(wid_site_survey_reslts_s), GFP_KERNEL); - if (pstrSurveyResults == NULL) { - u32SurveyResultsCount = 0; - WILC_ERRORREPORT(s32Error, WILC_NO_MEM); - } + if (!pstrSurveyResults) + return -ENOMEM; WILC_memset((void *)(pstrSurveyResults), 0, u32SurveyResultsCount * sizeof(wid_site_survey_reslts_s));