commit 7a5cc772c39e93d748bccfd2022696ea95098bca
author Linux Build Service Account <lnxbuild@localhost> Sat Jun 01 10:42:21 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Jun 01 10:42:21 2013 -0700
tree 9c2542d156804d87ef9a82ea662aa759a0974d4b
parent 4993028fe4f76375abe48f0074a87fd0d6b6444b
parent 37c2068f3c293d9935d5b0f863c5b744f4db4842

Merge "wcnss: Prevent access to WCNSS driver after a failure"

drivers/net/wireless/wcnss/wcnss_wlan.c

diff --git a/drivers/net/wireless/wcnss/wcnss_wlan.c b/drivers/net/wireless/wcnss/wcnss_wlan.c
index 8312c16..e8b8fc2 100644
--- a/drivers/net/wireless/wcnss/wcnss_wlan.c
+++ b/drivers/net/wireless/wcnss/wcnss_wlan.c
@@ -1683,6 +1683,9 @@
 {
 	struct platform_device *pdev;
 
+	if (!penv)
+		return -EFAULT;
+
 	/* first open is only to trigger WCNSS platform driver */
 	if (!penv->triggered) {
 		pr_info(DEVICE " triggered by userspace\n");
@@ -1710,7 +1713,7 @@
 {
 	int rc = 0;
 
-	if (!penv->device_opened)
+	if (!penv || !penv->device_opened)
 		return -EFAULT;
 
 	rc = wait_event_interruptible(penv->read_wait, penv->fw_cal_rcvd
@@ -1749,7 +1752,7 @@
 	int rc = 0;
 	int size = 0;
 
-	if (!penv->device_opened || penv->user_cal_available)
+	if (!penv || !penv->device_opened || penv->user_cal_available)
 		return -EFAULT;
 
 	if (penv->user_cal_rcvd == 0 && count >= 4