From patchwork Tue Oct 27 11:40:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaehyun Lim X-Patchwork-Id: 7496391 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 65B37BEEA4 for ; Tue, 27 Oct 2015 11:41:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9806F20603 for ; Tue, 27 Oct 2015 11:41:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 918ED205FA for ; Tue, 27 Oct 2015 11:41:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754139AbbJ0LlD (ORCPT ); Tue, 27 Oct 2015 07:41:03 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:34611 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753543AbbJ0LlC (ORCPT ); Tue, 27 Oct 2015 07:41:02 -0400 Received: by padhk11 with SMTP id hk11so220890268pad.1 for ; Tue, 27 Oct 2015 04:41:01 -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=wHyLaGQZpKSOha4lk4e0f5jmYPuuAJTUcAHMYrrbNmA=; b=FQPSRiyiCM9wzZa0QrUquVPWhGDYNWJrTCDQr0OZf2w4gLELfy9gzoBAx3Z7zWq+Ql bIEh0PmffPIhEhWixQdosWrlml7ygTeQCbRSa3cbTT5x6b1jhubbhc6ymqMPAD8Xzuqr bCCQfQZSrnJ0NRE9uSQZND61q1G0Y9z5xbqKlxl+mLEhScE52B1u5Kh4buBXtnwIhOuH DsmTwcPi+YRTAI7KPQJO+XCS49b4H+xmtW4hzZ93frNtB1u8ODzuPPU82EFj6PMSGwxp LjKs1FKAtsu7T3ArHeh7n2iGIKMdu8WbH/wMJ2XPL6Isr6LRvKt13bDvWSRb6I+R6n6C UUjw== X-Received: by 10.68.134.232 with SMTP id pn8mr26987734pbb.47.1445946061666; Tue, 27 Oct 2015 04:41:01 -0700 (PDT) Received: from localhost.localdomain ([218.233.16.2]) by smtp.gmail.com with ESMTPSA id si10sm39382512pab.15.2015.10.27.04.40.58 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Oct 2015 04:41:01 -0700 (PDT) From: Chaehyun Lim To: gregkh@linuxfoundation.org Cc: johnny.kim@atmel.com, rachel.kim@atmel.com, chris.park@atmel.com, tony.cho@atmel.com, glen.lee@atmel.com, leo.kim@atmel.com, linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org, Chaehyun Lim Subject: [PATCH 6/8] staging: wilc1000: replace kmalloc/memcpy with kmemdup Date: Tue, 27 Oct 2015 20:40:37 +0900 Message-Id: <1445946039-10390-6-git-send-email-chaehyun.lim@gmail.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1445946039-10390-1-git-send-email-chaehyun.lim@gmail.com> References: <1445946039-10390-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=-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 This patch replaces kmalloc followed by memcpy with kmemdup. It is also added error checking of kmemdup. Signed-off-by: Chaehyun Lim --- drivers/staging/wilc1000/host_interface.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index f7dc61b..50362c4 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -3177,8 +3177,10 @@ int host_int_add_wep_key_bss_sta(struct host_if_drv *hif_drv, msg.body.key_info.type = WEP; msg.body.key_info.action = ADDKEY; msg.drv = hif_drv; - msg.body.key_info.attr.wep.key = kmalloc(len, GFP_KERNEL); - memcpy(msg.body.key_info.attr.wep.key, key, len); + msg.body.key_info.attr.wep.key = kmemdup(key, len, GFP_KERNEL); + if (!msg.body.key_info.attr.wep.key) + return -ENOMEM; + msg.body.key_info.attr.wep.key_len = len; msg.body.key_info.attr.wep.index = index;