diff --git a/os/linux/gl_wext.c b/os/linux/gl_wext.c
index d1f6bf2..4f0837b 100644
--- a/os/linux/gl_wext.c
+++ b/os/linux/gl_wext.c
@@ -2064,7 +2064,7 @@
 
 	kalMemFree(prSsid, VIR_MEM_TYPE, sizeof(PARAM_SSID_T));
 
-	return 0;
+	return rStatus;
 }				/* wext_get_essid */
 
 #if 0
@@ -3496,7 +3496,7 @@
 
 		ret = wext_get_essid(prDev, NULL, &iwr->u.essid, prExtraBuf);
 		if (ret == 0) {
-			if (copy_to_user(iwr->u.essid.pointer, prExtraBuf, iwr->u.essid.length))
+			if (copy_to_user(iwr->u.essid.pointer, prExtraBuf, IW_ESSID_MAX_SIZE))
 				ret = -EFAULT;
 		}