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;
+			}
 		}
 	}