Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acd84763 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa: Fix to validate routing table index for filter exception"

parents e8763cbd e206edc0

drivers/platform/msm/ipa/ipa_v3/ipa_flt.c

+20 −5
Original line number Diff line number Diff line
@@ -758,6 +758,11 @@ static int __ipa_validate_flt_rule(const struct ipa_flt_rule *rule, 
				goto error;

			}

		}

	} else {

		if (rule->rt_tbl_idx > 0) {

			IPAERR("invalid RT tbl\n");

			goto error;

		}

	}



	if (ipa3_ctx->ipa_hw_type >= IPA_HW_v4_0) {
@@ -778,7 +783,8 @@ static int __ipa_validate_flt_rule(const struct ipa_flt_rule *rule, 
	}



	if (rule->rule_id) {

		if (!(rule->rule_id & ipahal_get_rule_id_hi_bit())) {

		if ((rule->rule_id < ipahal_get_rule_id_hi_bit()) ||

		(rule->rule_id >= ((ipahal_get_rule_id_hi_bit()<<1)-1))) {

			IPAERR("invalid rule_id provided 0x%x\n"

				"rule_id with bit 0x%x are auto generated\n",

				rule->rule_id, ipahal_get_rule_id_hi_bit());
@@ -876,7 +882,8 @@ static int __ipa_add_flt_rule(struct ipa3_flt_tbl *tbl, enum ipa_ip_type ip, 
ipa_insert_failed:

	list_del(&entry->link);

	/* if rule id was allocated from idr, remove it */

	if (!(entry->rule_id & ipahal_get_rule_id_hi_bit()))

	if ((entry->rule_id < ipahal_get_rule_id_hi_bit()) &&

		(entry->rule_id >= ipahal_get_low_rule_id()))

		idr_remove(entry->tbl->rule_ids, entry->rule_id);

	kmem_cache_free(ipa3_ctx->flt_rule_cache, entry);
@@ -923,7 +930,8 @@ static int __ipa_add_flt_rule_after(struct ipa3_flt_tbl *tbl, 
ipa_insert_failed:

	list_del(&entry->link);

	/* if rule id was allocated from idr, remove it */

	if (!(entry->rule_id & ipahal_get_rule_id_hi_bit()))

	if ((entry->rule_id < ipahal_get_rule_id_hi_bit()) &&

		(entry->rule_id >= ipahal_get_low_rule_id()))

		idr_remove(entry->tbl->rule_ids, entry->rule_id);

	kmem_cache_free(ipa3_ctx->flt_rule_cache, entry);
@@ -957,7 +965,8 @@ static int __ipa_del_flt_rule(u32 rule_hdl) 
		entry->tbl->rule_cnt, entry->rule_id);

	entry->cookie = 0;

	/* if rule id was allocated from idr, remove it */

	if (!(entry->rule_id & ipahal_get_rule_id_hi_bit()))

	if ((entry->rule_id < ipahal_get_rule_id_hi_bit()) &&

		(entry->rule_id >= ipahal_get_low_rule_id()))

		idr_remove(entry->tbl->rule_ids, entry->rule_id);



	kmem_cache_free(ipa3_ctx->flt_rule_cache, entry);
@@ -1013,6 +1022,11 @@ static int __ipa_mdfy_flt_rule(struct ipa_flt_rule_mdfy *frule, 
				goto error;

			}

		}

	} else {

		if (frule->rule.rt_tbl_idx > 0) {

			IPAERR_RL("invalid RT tbl\n");

			goto error;

		}

	}



	entry->rule = frule->rule;
@@ -1377,7 +1391,8 @@ int ipa3_reset_flt(enum ipa_ip_type ip) 
			if (entry->rt_tbl)

				entry->rt_tbl->ref_cnt--;

			/* if rule id was allocated from idr, remove it */

			if (!(entry->rule_id & ipahal_get_rule_id_hi_bit()))

			if ((entry->rule_id < ipahal_get_rule_id_hi_bit()) &&

				(entry->rule_id >= ipahal_get_low_rule_id()))

				idr_remove(entry->tbl->rule_ids,

					entry->rule_id);

			entry->cookie = 0;