From 09c99c4de5de2d56b5401c971b172d8f1a869e79 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Sat, 15 May 2010 23:24:07 +0200
Subject: [PATCH] --- yaml --- r: 202751 b: refs/heads/master c:
 1d66fa777d674da3a5172dcdd930f8928b1904c6 h: refs/heads/master i:   202749:
 c4224bfc04f4a0d8b296823fa2c799ab975e3687   202747:
 665a4f267d4f94d6db873b3fc6dfa7e860f97d91   202743:
 b3e8f623284e3756ce6ce3774f9f89c241f0f081   202735:
 83c83b5fb54e0abadc131287ddea2d43420aadc7   202719:
 58a86d520cb605cedf6264cf67f0d40b5bb41bf4   202687:
 79eb433c91698edc91a5912f47a4fe333996f87e   202623:
 8ebc8d008879281728497348def7b2d443da955d   202495:
 f7e0dc1fbb3886ae6c56738a3673f6c28ccc41bb   202239:
 87e0a6811ebde81333129db99ad5ffa86a14dea2   201727:
 bce1f8f6855e74efa03c5ac2f9237573cc3a7d3f   200703:
 6a551968e42efdf2150d8ec1cd4f9729bcc23b4b v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/net/wireless/orinoco/wext.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ecbad2885932..b47652f8421d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27b81bbed881ae93e8c23c216129cdeee86d4051
+refs/heads/master: 1d66fa777d674da3a5172dcdd930f8928b1904c6
diff --git a/trunk/drivers/net/wireless/orinoco/wext.c b/trunk/drivers/net/wireless/orinoco/wext.c
index 5775124e2aee..a63108c6df7d 100644
--- a/trunk/drivers/net/wireless/orinoco/wext.c
+++ b/trunk/drivers/net/wireless/orinoco/wext.c
@@ -993,11 +993,9 @@ static int orinoco_ioctl_set_genie(struct net_device *dev,
 		return -EINVAL;
 
 	if (wrqu->data.length) {
-		buf = kmalloc(wrqu->data.length, GFP_KERNEL);
+		buf = kmemdup(extra, wrqu->data.length, GFP_KERNEL);
 		if (buf == NULL)
 			return -ENOMEM;
-
-		memcpy(buf, extra, wrqu->data.length);
 	} else
 		buf = NULL;