commit 5fc96fc430d4d3d0147c04d54ab54e39d49fe06d
author Linux Build Service Account <lnxbuild@localhost> Thu Nov 07 01:30:26 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Nov 07 01:30:25 2013 -0800
tree 73f5397910b9d5d61607951e1cfc3986324e8145
parent 03a3d7e80cb500362c54231022afffebc0b8428c
parent cd2546a93fefef9dddc00dd06155626390c15d13

Merge "msm: ipa: fix potential NULL pointer dereference"

drivers/platform/msm/ipa/ipa_rt.c

diff --git a/drivers/platform/msm/ipa/ipa_rt.c b/drivers/platform/msm/ipa/ipa_rt.c
index 8d6d5e6..f453010 100644
--- a/drivers/platform/msm/ipa/ipa_rt.c
+++ b/drivers/platform/msm/ipa/ipa_rt.c
@@ -843,8 +843,11 @@
 					 &tbl->head_rt_rule_list, link) {
 			node = ipa_search(&ipa_ctx->rt_rule_hdl_tree,
 					  (u32)rule);
-			if (node == NULL)
+			if (node == NULL) {
 				WARN_ON(1);
+				mutex_unlock(&ipa_ctx->lock);
+				return -EFAULT;
+			}
 
 			/*
 			 * for the "default" routing tbl, remove all but the
@@ -866,8 +869,11 @@
 		}
 
 		node = ipa_search(&ipa_ctx->rt_tbl_hdl_tree, (u32)tbl);
-		if (node  == NULL)
+		if (node  == NULL) {
 			WARN_ON(1);
+			mutex_unlock(&ipa_ctx->lock);
+			return -EFAULT;
+		}
 
 		/* do not remove the "default" routing tbl which has index 0 */
 		if (tbl->idx != 0) {