From patchwork Thu Jul 23 11:19:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaehyun Lim X-Patchwork-Id: 6853041 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 5A1499F358 for ; Thu, 23 Jul 2015 11:19:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 741082064C for ; Thu, 23 Jul 2015 11:19:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 86CB120649 for ; Thu, 23 Jul 2015 11:19:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752940AbbGWLTi (ORCPT ); Thu, 23 Jul 2015 07:19:38 -0400 Received: from mail-pd0-f175.google.com ([209.85.192.175]:35125 "EHLO mail-pd0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752639AbbGWLTh (ORCPT ); Thu, 23 Jul 2015 07:19:37 -0400 Received: by pdrg1 with SMTP id g1so155750976pdr.2 for ; Thu, 23 Jul 2015 04:19:37 -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=syvk3UsEUpHaPzm1Wktm21ukE7kUk4h+NZl2SFPxafQ=; b=umVnx3qT2EEaFU5CWbCaz0ZgZfqfxb/3rlVKD3DEEyAIp1vO+55xVVeINd4HU9up7B fm/TbLhKuOLSeXxkF9VKT2fzMve9CdnmXADSLkaTbwWpVaQEyRDgvpj3I6Cuh4mvJxMN 3NaBoeqb/BZot+xTZlRVQ96XvQPgOfC6YUc06itJM0YBJiwVfAr2mJiVeaVhv7gtG6eQ HVlQpFihzBziruGPo7R4lIgj+3U+8ZzVjZE8LRebluzOiuVNF1WfCcn+y1yl/TTWTHzX QZ3Y6P4nsGLmW1ZUyNsESWruF7C7Ev5lImE3bwwyMTBVxhgCMUOyGbi6WeFUTGVPm6wW 0NEA== X-Received: by 10.66.180.71 with SMTP id dm7mr9133619pac.61.1437650376997; Thu, 23 Jul 2015 04:19:36 -0700 (PDT) Received: from localhost.localdomain ([218.233.16.2]) by smtp.gmail.com with ESMTPSA id oq10sm8400971pdb.75.2015.07.23.04.19.34 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 23 Jul 2015 04:19:36 -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 3/3] staging: wilc1000: coreconfigurator.c: fix kmalloc error check Date: Thu, 23 Jul 2015 20:19:19 +0900 Message-Id: <1437650359-2051-3-git-send-email-chaehyun.lim@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1437650359-2051-1-git-send-email-chaehyun.lim@gmail.com> References: <1437650359-2051-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 --- 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 b51c15f..eca21bf 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_ATOMIC); - if (gps8ConfigPacket == NULL) { - PRINT_ER("failed in gps8ConfigPacket allocation\n"); - s32Error = WILC_NO_MEM; - goto _fail_; - } + if (gps8ConfigPacket == NULL) + 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_ATOMIC); - if (pstrSurveyResults == NULL) { - u32SurveyResultsCount = 0; - WILC_ERRORREPORT(s32Error, WILC_NO_MEM); - } + if (pstrSurveyResults == NULL) + return -ENOMEM; WILC_memset((void *)(pstrSurveyResults), 0, u32SurveyResultsCount * sizeof(wid_site_survey_reslts_s));