Merge "msm: ipa3: Add mutex to prevent race condition" (c28f81a4) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/platform/msm/ipa/ipa_v2/ipa_nat.c

+13 −0

Original line number	Diff line number	Diff line
		@@ -341,14 +341,18 @@ int ipa2_nat_init_cmd(struct ipa_ioc_v4_nat_init *init)
		size_t tmp;
		gfp_t flag = GFP_KERNEL \| (ipa_ctx->use_dma_zone ? GFP_DMA : 0);

		mutex_lock(&ipa_ctx->nat_mem.lock);

		if (!ipa_ctx->nat_mem.is_dev_init) {
		IPAERR_RL("Nat table not initialized\n");
		mutex_unlock(&ipa_ctx->nat_mem.lock);
		return -EPERM;
		}

		IPADBG("\n");
		if (init->table_entries == 0) {
		IPADBG("Table entries is zero\n");
		mutex_unlock(&ipa_ctx->nat_mem.lock);
		return -EPERM;
		}

		@@ -356,6 +360,7 @@ int ipa2_nat_init_cmd(struct ipa_ioc_v4_nat_init *init)
		if (init->ipv4_rules_offset >
		(UINT_MAX - (TBL_ENTRY_SIZE * (init->table_entries + 1)))) {
		IPAERR_RL("Detected overflow\n");
		mutex_unlock(&ipa_ctx->nat_mem.lock);
		return -EPERM;
		}
		/* Check Table Entry offset is not
		@@ -368,6 +373,7 @@ int ipa2_nat_init_cmd(struct ipa_ioc_v4_nat_init *init)
		IPAERR_RL("offset:%d entrys:%d size:%zu mem_size:%zu\n",
		init->ipv4_rules_offset, (init->table_entries + 1),
		tmp, ipa_ctx->nat_mem.size);
		mutex_unlock(&ipa_ctx->nat_mem.lock);
		return -EPERM;
		}

		@@ -375,6 +381,7 @@ int ipa2_nat_init_cmd(struct ipa_ioc_v4_nat_init *init)
		if (init->expn_rules_offset >
		UINT_MAX - (TBL_ENTRY_SIZE * init->expn_table_entries)) {
		IPAERR_RL("Detected overflow\n");
		mutex_unlock(&ipa_ctx->nat_mem.lock);
		return -EPERM;
		}
		/* Check Expn Table Entry offset is not
		@@ -387,6 +394,7 @@ int ipa2_nat_init_cmd(struct ipa_ioc_v4_nat_init *init)
		IPAERR_RL("offset:%d entrys:%d size:%zu mem_size:%zu\n",
		init->expn_rules_offset, init->expn_table_entries,
		tmp, ipa_ctx->nat_mem.size);
		mutex_unlock(&ipa_ctx->nat_mem.lock);
		return -EPERM;
		}

		@@ -394,6 +402,7 @@ int ipa2_nat_init_cmd(struct ipa_ioc_v4_nat_init *init)
		if (init->index_offset >
		UINT_MAX - (INDX_TBL_ENTRY_SIZE * (init->table_entries + 1))) {
		IPAERR_RL("Detected overflow\n");
		mutex_unlock(&ipa_ctx->nat_mem.lock);
		return -EPERM;
		}
		/* Check Indx Table Entry offset is not
		@@ -406,6 +415,7 @@ int ipa2_nat_init_cmd(struct ipa_ioc_v4_nat_init *init)
		IPAERR_RL("offset:%d entrys:%d size:%zu mem_size:%zu\n",
		init->index_offset, (init->table_entries + 1),
		tmp, ipa_ctx->nat_mem.size);
		mutex_unlock(&ipa_ctx->nat_mem.lock);
		return -EPERM;
		}

		@@ -413,6 +423,7 @@ int ipa2_nat_init_cmd(struct ipa_ioc_v4_nat_init *init)
		if (init->index_expn_offset >
		(UINT_MAX - (INDX_TBL_ENTRY_SIZE * init->expn_table_entries))) {
		IPAERR_RL("Detected overflow\n");
		mutex_unlock(&ipa_ctx->nat_mem.lock);
		return -EPERM;
		}
		/* Check Expn Table entry offset is not
		@@ -425,6 +436,7 @@ int ipa2_nat_init_cmd(struct ipa_ioc_v4_nat_init *init)
		IPAERR_RL("offset:%d entrys:%d size:%zu mem_size:%zu\n",
		init->index_expn_offset, init->expn_table_entries,
		tmp, ipa_ctx->nat_mem.size);
		mutex_unlock(&ipa_ctx->nat_mem.lock);
		return -EPERM;
		}

		@@ -573,6 +585,7 @@ int ipa2_nat_init_cmd(struct ipa_ioc_v4_nat_init *init)
		free_nop:
		kfree(reg_write_nop);
		bail:
		mutex_unlock(&ipa_ctx->nat_mem.lock);
		return result;
		}

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -842,19 +842,24 @@ int ipa3_nat_init_cmd(struct ipa_ioc_v4_nat_init *init)

		IPADBG("\n");

		mutex_lock(&ipa3_ctx->nat_mem.dev.lock);

		if (!ipa3_ctx->nat_mem.dev.is_mapped) {
		IPAERR_RL("attempt to init %s before mmap\n",
		ipa3_ctx->nat_mem.dev.name);
		mutex_unlock(&ipa3_ctx->nat_mem.dev.lock);
		return -EPERM;
		}

		if (init->tbl_index >= 1) {
		IPAERR_RL("Unsupported table index %d\n", init->tbl_index);
		mutex_unlock(&ipa3_ctx->nat_mem.dev.lock);
		return -EPERM;
		}

		if (init->table_entries == 0) {
		IPAERR_RL("Table entries is zero\n");
		mutex_unlock(&ipa3_ctx->nat_mem.dev.lock);
		return -EPERM;
		}

		@@ -865,6 +870,7 @@ int ipa3_nat_init_cmd(struct ipa_ioc_v4_nat_init *init)
		IPAHAL_NAT_IPV4);
		if (result) {
		IPAERR_RL("Bad params for NAT base table\n");
		mutex_unlock(&ipa3_ctx->nat_mem.dev.lock);
		return result;
		}

		@@ -875,6 +881,7 @@ int ipa3_nat_init_cmd(struct ipa_ioc_v4_nat_init *init)
		IPAHAL_NAT_IPV4);
		if (result) {
		IPAERR_RL("Bad params for NAT expansion table\n");
		mutex_unlock(&ipa3_ctx->nat_mem.dev.lock);
		return result;
		}

		@@ -885,6 +892,7 @@ int ipa3_nat_init_cmd(struct ipa_ioc_v4_nat_init *init)
		IPAHAL_NAT_IPV4_INDEX);
		if (result) {
		IPAERR_RL("Bad params for index table\n");
		mutex_unlock(&ipa3_ctx->nat_mem.dev.lock);
		return result;
		}

		@@ -895,6 +903,7 @@ int ipa3_nat_init_cmd(struct ipa_ioc_v4_nat_init *init)
		IPAHAL_NAT_IPV4_INDEX);
		if (result) {
		IPAERR_RL("Bad params for index expansion table\n");
		mutex_unlock(&ipa3_ctx->nat_mem.dev.lock);
		return result;
		}

		@@ -928,6 +937,7 @@ int ipa3_nat_init_cmd(struct ipa_ioc_v4_nat_init *init)
		result = ipa3_nat_send_init_cmd(&cmd, false);
		if (result) {
		IPAERR("Fail to send NAT init immediate command\n");
		mutex_unlock(&ipa3_ctx->nat_mem.dev.lock);
		return result;
		}

		@@ -953,6 +963,8 @@ int ipa3_nat_init_cmd(struct ipa_ioc_v4_nat_init *init)
		ipa3_ctx->nat_mem.index_table_expansion_addr);

		ipa3_ctx->nat_mem.dev.is_hw_init = true;
		mutex_unlock(&ipa3_ctx->nat_mem.dev.lock);

		IPADBG("return\n");
		return 0;
		}