From f3556a6a57bf482618ebb5d222f9e2ecdc14881a Mon Sep 17 00:00:00 2001
From: Julia Lawall <Julia.Lawall@lip6.fr>
Date: Mon, 9 Apr 2012 11:01:09 +0200
Subject: [PATCH] --- yaml --- r: 299047 b: refs/heads/master c:
 7ab2485b69571a3beb0313c591486626c3374c85 h: refs/heads/master i:   299045:
 dd4da9f1973836bc237ddba3e21116ba2fb71468   299043:
 bae7537b5279ba9d9732f11284c2b3a1dd89c339   299039:
 58835cd24c177dc61c4e47ca17bc4ef7ef23afef v: v3

---
 [refs]                         | 2 +-
 trunk/net/wireless/wext-core.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ff445a0d6208..a41ebdb0e7af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e89f7690a3adbde0af7c294f83c242ba6a367ef0
+refs/heads/master: 7ab2485b69571a3beb0313c591486626c3374c85
diff --git a/trunk/net/wireless/wext-core.c b/trunk/net/wireless/wext-core.c
index 0af7f54e4f61..af648e08e61b 100644
--- a/trunk/net/wireless/wext-core.c
+++ b/trunk/net/wireless/wext-core.c
@@ -780,8 +780,10 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
 		if (cmd == SIOCSIWENCODEEXT) {
 			struct iw_encode_ext *ee = (void *) extra;
 
-			if (iwp->length < sizeof(*ee) + ee->key_len)
-				return -EFAULT;
+			if (iwp->length < sizeof(*ee) + ee->key_len) {
+				err = -EFAULT;
+				goto out;
+			}
 		}
 	}