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

Commit aa89b686 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 unsigned integer underflow"

parents e10e0cc4 d43c4366

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

+9 −1
Original line number Diff line number Diff line
@@ -1454,6 +1454,10 @@ static ssize_t ipa_read_nat4(struct file *file, 
	pr_err("Table Size:%d\n",

				ipa_ctx->nat_mem.size_base_tables);



	if (!ipa_ctx->nat_mem.size_expansion_tables)

		pr_err("Expansion Table Size:%d\n",

				ipa_ctx->nat_mem.size_expansion_tables);

	else

		pr_err("Expansion Table Size:%d\n",

				ipa_ctx->nat_mem.size_expansion_tables-1);
@@ -1469,6 +1473,8 @@ static ssize_t ipa_read_nat4(struct file *file, 


			pr_err("\nBase Table:\n");

		} else {

			if (!ipa_ctx->nat_mem.size_expansion_tables)

				continue;

			tbl_size = ipa_ctx->nat_mem.size_expansion_tables-1;

			base_tbl =

			 (u32 *)ipa_ctx->nat_mem.ipv4_expansion_rules_addr;
@@ -1568,6 +1574,8 @@ static ssize_t ipa_read_nat4(struct file *file, 


			pr_err("\nIndex Table:\n");

		} else {

			if (!ipa_ctx->nat_mem.size_expansion_tables)

				continue;

			tbl_size = ipa_ctx->nat_mem.size_expansion_tables-1;

			indx_tbl =

			 (u32 *)ipa_ctx->nat_mem.index_table_expansion_addr;

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

+9 −1
Original line number Diff line number Diff line
@@ -1439,6 +1439,10 @@ static ssize_t ipa3_read_nat4(struct file *file, 
	pr_err("Table Size:%d\n",

				ipa3_ctx->nat_mem.size_base_tables);



	if (!ipa3_ctx->nat_mem.size_expansion_tables)

		pr_err("Expansion Table Size:%d\n",

				ipa3_ctx->nat_mem.size_expansion_tables);

	else

		pr_err("Expansion Table Size:%d\n",

				ipa3_ctx->nat_mem.size_expansion_tables-1);
@@ -1454,6 +1458,8 @@ static ssize_t ipa3_read_nat4(struct file *file, 


			pr_err("\nBase Table:\n");

		} else {

			if (!ipa3_ctx->nat_mem.size_expansion_tables)

				continue;

			tbl_size = ipa3_ctx->nat_mem.size_expansion_tables-1;

			base_tbl =

			 (u32 *)ipa3_ctx->nat_mem.ipv4_expansion_rules_addr;
@@ -1553,6 +1559,8 @@ static ssize_t ipa3_read_nat4(struct file *file, 


			pr_err("\nIndex Table:\n");

		} else {

			if (!ipa3_ctx->nat_mem.size_expansion_tables)

				continue;

			tbl_size = ipa3_ctx->nat_mem.size_expansion_tables-1;

			indx_tbl =

			 (u32 *)ipa3_ctx->nat_mem.index_table_expansion_addr;