From patchwork Sun Jan 3 08:35:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaehyun Lim X-Patchwork-Id: 7943131 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 775869F1C0 for ; Sun, 3 Jan 2016 08:37:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B00D0203AC for ; Sun, 3 Jan 2016 08:37:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E6E2D203A5 for ; Sun, 3 Jan 2016 08:37:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751864AbcACIhB (ORCPT ); Sun, 3 Jan 2016 03:37:01 -0500 Received: from mail-pa0-f45.google.com ([209.85.220.45]:34275 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751826AbcACIhB (ORCPT ); Sun, 3 Jan 2016 03:37:01 -0500 Received: by mail-pa0-f45.google.com with SMTP id uo6so161304797pac.1 for ; Sun, 03 Jan 2016 00:37:00 -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=MDI81TnInN9UEmxGGhYfTSsiOjMAd3tkd5SU2WD95Co=; b=USCUqr4UPjuPdqFsl4u9ARlPUeBoUrY1WdimS7sobOyTuWHtkpI99BE8bKlAuJaMH8 Yds7RZQPWHQJGnnI27myzsnoOsNiD4/esxiRe+JATq43lgy44XxubQuBJFtnTkuEtSl8 MYGTKu4z9i7Qbx/ngUXo7gkGxk7SS6b6WPOkbuV1Jb6ia6gbkNv9380DtHnjn2TX/4QC sxLXDdIR6oY4pgjjoldSsLMzHjVfcnvE5gnRGA/LJdoNbIviTmUO/dgcKgoQnFCtP5WI fxLQ3WA53Y3Lni3KNFfg16ntgDh3/LRrgLcIcp+VMwV+qCfqIifXNIh9YPD/vDzaR2Mj GRpg== X-Received: by 10.66.219.98 with SMTP id pn2mr117874563pac.113.1451810220650; Sun, 03 Jan 2016 00:37:00 -0800 (PST) Received: from localhost.localdomain ([218.233.16.2]) by smtp.gmail.com with ESMTPSA id 6sm55443374pfm.46.2016.01.03.00.36.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 03 Jan 2016 00:37:00 -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 15/30] staging: wilc1000: use kmemdup in wilc_edit_station Date: Sun, 3 Jan 2016 17:35:47 +0900 Message-Id: <1451810162-16993-15-git-send-email-chaehyun.lim@gmail.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1451810162-16993-1-git-send-email-chaehyun.lim@gmail.com> References: <1451810162-16993-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. Signed-off-by: Chaehyun Lim --- drivers/staging/wilc1000/host_interface.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 2f94804..290c27a 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -4372,13 +4372,11 @@ int wilc_edit_station(struct wilc_vif *vif, memcpy(add_sta_info, sta_param, sizeof(struct add_sta_param)); if (add_sta_info->rates_len > 0) { - u8 *rates = kmalloc(add_sta_info->rates_len, GFP_KERNEL); - + u8 *rates = kmemdup(sta_param->rates, + add_sta_info->rates_len, + GFP_KERNEL); if (!rates) return -ENOMEM; - - memcpy(rates, sta_param->rates, - add_sta_info->rates_len); add_sta_info->rates = rates; }