From patchwork Sun Nov 8 07:49:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaehyun Lim X-Patchwork-Id: 7577421 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 06FB4C05C6 for ; Sun, 8 Nov 2015 07:50:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3103B20610 for ; Sun, 8 Nov 2015 07:50:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 43F8F205CB for ; Sun, 8 Nov 2015 07:50:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754752AbbKHHuH (ORCPT ); Sun, 8 Nov 2015 02:50:07 -0500 Received: from mail-pa0-f54.google.com ([209.85.220.54]:36744 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752670AbbKHHuG (ORCPT ); Sun, 8 Nov 2015 02:50:06 -0500 Received: by pacdm15 with SMTP id dm15so141906438pac.3 for ; Sat, 07 Nov 2015 23:50:05 -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:in-reply-to:references; bh=CwAUrv7/Ic9nKAfZ9cthrRn/h7CJ5TgzNOHHZ4PJFk0=; b=au5vIRH5XoTtgt9VWvUNYKYamlfMkmLJEKmTxNSU92Dlo/1uUGQQJp/yDExyMBQiFy KdKbVVZlfIobJ1S4Pf1/SoFFIP4VQFDKTR038tTb8YNy1neyCBY80vgLcQNaCeowGKl8 C+jlq++W8xaKBf1IGI8MDatI/ZcdowkQz2fwmyEQmwyUv4vF3edsjjuLgwe8P2OWuFrz 8XnnnJ8/1x7U8B3ejVL8VUHOspjCAU5lk4nDXdcJNqoyiCyMAT492TwIifpe7PwzJ6ku wghBWILl9ni/w7KTjkYtl5A1UT6p5DNG9ylcFTRHGqP3ThYxzn69VBDEEjCoHfdJFO5D 0XKA== X-Received: by 10.68.163.97 with SMTP id yh1mr30163872pbb.36.1446969005806; Sat, 07 Nov 2015 23:50:05 -0800 (PST) Received: from localhost.localdomain ([218.233.16.2]) by smtp.gmail.com with ESMTPSA id tt7sm9435142pab.45.2015.11.07.23.50.03 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 07 Nov 2015 23:50:05 -0800 (PST) From: Chaehyun Lim To: gregkh@linuxfoundation.org Cc: johnny.kim@atmel.com, austin.shin@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 11/32] staging: wilc1000: use kmemdup in host_int_add_ptk Date: Sun, 8 Nov 2015 16:49:04 +0900 Message-Id: <1446968965-8958-11-git-send-email-chaehyun.lim@gmail.com> X-Mailer: git-send-email 2.6.3 In-Reply-To: <1446968965-8958-1-git-send-email-chaehyun.lim@gmail.com> References: <1446968965-8958-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, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 changes kmalloc followed by memcpy to kmemdup The error checking is also added when kmemdup is failed. Signed-off-by: Chaehyun Lim --- drivers/staging/wilc1000/host_interface.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index dd7e8ed..18623c7 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -3239,8 +3239,9 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk, if (mode == STATION_MODE) msg.body.key_info.action = ADDKEY; - msg.body.key_info.attr.wpa.key = kmalloc(ptk_key_len, GFP_KERNEL); - memcpy(msg.body.key_info.attr.wpa.key, ptk, ptk_key_len); + msg.body.key_info.attr.wpa.key = kmemdup(ptk, ptk_key_len, GFP_KERNEL); + if (!msg.body.key_info.attr.wpa.key) + return -ENOMEM; if (rx_mic) { memcpy(msg.body.key_info.attr.wpa.key + 16, rx_mic, RX_MIC_KEY_LEN);