From patchwork Sat May 15 21:21:01 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Julia Lawall <julia@diku.dk>
X-Patchwork-Id: 99903
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4FLLxlB016588
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Sat, 15 May 2010 21:21:59 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756239Ab0EOVVO (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Sat, 15 May 2010 17:21:14 -0400
Received: from mgw2.diku.dk ([130.225.96.92]:35454 "EHLO mgw2.diku.dk"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1756076Ab0EOVVH (ORCPT <rfc822; linux-wireless@vger.kernel.org>);
	Sat, 15 May 2010 17:21:07 -0400
Received: from localhost (localhost [127.0.0.1])
	by mgw2.diku.dk (Postfix) with ESMTP id 223CB19BB80;
	Sat, 15 May 2010 23:21:07 +0200 (CEST)
Received: from mgw2.diku.dk ([127.0.0.1])
	by localhost (mgw2.diku.dk [127.0.0.1]) (amavisd-new,
	port 10024) with ESMTP
	id 07116-17; Sat, 15 May 2010 23:21:02 +0200 (CEST)
Received: from nhugin.diku.dk (nhugin.diku.dk [130.225.96.140])
	by mgw2.diku.dk (Postfix) with ESMTP id 0932719BB6D;
	Sat, 15 May 2010 23:21:02 +0200 (CEST)
Received: from ask.diku.dk (ask.diku.dk [130.225.96.225])
	by nhugin.diku.dk (Postfix) with ESMTP
	id 80EEF6DFD0D; Sat, 15 May 2010 23:13:50 +0200 (CEST)
Received: by ask.diku.dk (Postfix, from userid 3767)
	id E0332200BE; Sat, 15 May 2010 23:21:01 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
	by ask.diku.dk (Postfix) with ESMTP id D89C3200BC;
	Sat, 15 May 2010 23:21:01 +0200 (CEST)
Date: Sat, 15 May 2010 23:21:01 +0200 (CEST)
From: Julia Lawall <julia@diku.dk>
To: Zhu Yi <yi.zhu@intel.com>, Reinette Chatre <reinette.chatre@intel.com>,
	Intel Linux Wireless <ilw@linux.intel.com>,
	"John W. Linville" <linville@tuxdriver.com>,
	linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [PATCH 26/37] drivers/net/wireless/ipw2x00: Use kmemdup
Message-ID: <Pine.LNX.4.64.1005152320450.21345@ask.diku.dk>
MIME-Version: 1.0
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Sat, 15 May 2010 21:21:59 +0000 (UTC)


diff -u -p a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -6626,13 +6626,12 @@ static int ipw_wx_set_genie(struct net_d
 		return -EINVAL;
 
 	if (wrqu->data.length) {
-		buf = kmalloc(wrqu->data.length, GFP_KERNEL);
+		buf = kmemdup(extra, wrqu->data.length, GFP_KERNEL);
 		if (buf == NULL) {
 			err = -ENOMEM;
 			goto out;
 		}
 
-		memcpy(buf, extra, wrqu->data.length);
 		kfree(ieee->wpa_ie);
 		ieee->wpa_ie = buf;
 		ieee->wpa_ie_len = wrqu->data.length;