commit 4c1716a284c4f4e816109dd650e55e29a83e467a
author Linux Build Service Account <lnxbuild@localhost> Thu Nov 07 01:30:27 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Nov 07 01:30:26 2013 -0800
tree 4c54e3ec4d3c2e41cc109c40feb5859747eb3cc0
parent 5fc96fc430d4d3d0147c04d54ab54e39d49fe06d
parent 5767aa81c39c796c4ed0f89353220d4ec4ae359c

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

drivers/platform/msm/ipa/ipa_flt.c

diff --git a/drivers/platform/msm/ipa/ipa_flt.c b/drivers/platform/msm/ipa/ipa_flt.c
index 2d75141..c3db716 100644
--- a/drivers/platform/msm/ipa/ipa_flt.c
+++ b/drivers/platform/msm/ipa/ipa_flt.c
@@ -802,8 +802,11 @@
 	IPADBG("reset flt ip=%d\n", ip);
 	list_for_each_entry_safe(entry, next, &tbl->head_flt_rule_list, link) {
 		node = ipa_search(&ipa_ctx->flt_rule_hdl_tree, (u32)entry);
-		if (node == NULL)
+		if (node == NULL) {
 			WARN_ON(1);
+			mutex_unlock(&ipa_ctx->lock);
+			return -EFAULT;
+		}
 
 		if ((ip == IPA_IP_v4 &&
 		     entry->rule.attrib.attrib_mask == IPA_FLT_PROTOCOL &&
@@ -833,8 +836,11 @@
 				link) {
 			node = ipa_search(&ipa_ctx->flt_rule_hdl_tree,
 					(u32)entry);
-			if (node == NULL)
+			if (node == NULL) {
 				WARN_ON(1);
+				mutex_unlock(&ipa_ctx->lock);
+				return -EFAULT;
+			}
 			list_del(&entry->link);
 			entry->tbl->rule_cnt--;
 			if (entry->rt_tbl)