net: ipa: verify table sizes fit in commands early

We currently verify the table size and offset fit in the immediate
command fields that must encode them in ipa_table_valid_one().  We
can now make this check earlier, in ipa_table_mem_valid().

The non-hashed IPv4 filter and route tables will always exist, and
their sizes will match the IPv6 tables, as well as the hashed tables
(if supported).  So it's sufficient to verify the offset and size of
the IPv4 non-hashed tables fit into these fields.

Rename the function ipa_cmd_table_init_valid(), to reinforce that
it is the TABLE_INIT immediate command fields we're checking.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ipa/ipa_cmd.c b/drivers/net/ipa/ipa_cmd.c
index e46e8f80b17431831432110b4d4863059efab8c7..abee6cc018a27ce544c52450b3f290900dc4fcf6 100644 (file)
--- a/drivers/net/ipa/ipa_cmd.c
+++ b/drivers/net/ipa/ipa_cmd.c
@@ -171,7 +171,8 @@ static void ipa_cmd_validate_build(void)
 }
 
 /* Validate a memory region holding a table */
-bool ipa_cmd_table_valid(struct ipa *ipa, const struct ipa_mem *mem, bool route)
+bool ipa_cmd_table_init_valid(struct ipa *ipa, const struct ipa_mem *mem,
+                             bool route)
 {
        u32 offset_max = field_max(IP_FLTRT_FLAGS_NHASH_ADDR_FMASK);
        u32 size_max = field_max(IP_FLTRT_FLAGS_NHASH_SIZE_FMASK);

diff --git a/drivers/net/ipa/ipa_cmd.h b/drivers/net/ipa/ipa_cmd.h
index 8e4243c1f0bbef911be79c93bb9045e989626c84..d03cc619e2c319c8a81ea9345baab716763fbf09 100644 (file)
--- a/drivers/net/ipa/ipa_cmd.h
+++ b/drivers/net/ipa/ipa_cmd.h
@@ -47,15 +47,15 @@ enum ipa_cmd_opcode {
 };
 
 /**
- * ipa_cmd_table_valid() - Validate a memory region holding a table
+ * ipa_cmd_table_init_valid() - Validate a memory region holding a table
  * @ipa:       - IPA pointer
  * @mem:       - IPA memory region descriptor
  * @route:     - Whether the region holds a route or filter table
  *
  * Return:     true if region is valid, false otherwise
  */
-bool ipa_cmd_table_valid(struct ipa *ipa, const struct ipa_mem *mem,
-                           bool route);
+bool ipa_cmd_table_init_valid(struct ipa *ipa, const struct ipa_mem *mem,
+                             bool route);
 
 /**
  * ipa_cmd_data_valid() - Validate command-realted configuration is valid

diff --git a/drivers/net/ipa/ipa_table.c b/drivers/net/ipa/ipa_table.c
index 222362a7a2a8cc67bbe701beb9fd3132cefe5f44..9822b18d9ed39ad6c135477e3f219bc2aa798255 100644 (file)
--- a/drivers/net/ipa/ipa_table.c
+++ b/drivers/net/ipa/ipa_table.c
@@ -166,10 +166,6 @@ ipa_table_valid_one(struct ipa *ipa, enum ipa_mem_id mem_id, bool route)
                size = IPA_ROUTE_COUNT_MAX * sizeof(__le64);
        else
                size = (1 + IPA_FILTER_COUNT_MAX) * sizeof(__le64);
-
-       if (!ipa_cmd_table_valid(ipa, mem, route))
-               return false;
-
        /* mem->size >= size is sufficient, but we'll demand more */
        if (mem->size == size)
                return true;
@@ -645,6 +641,10 @@ static bool ipa_table_mem_valid(struct ipa *ipa, bool modem_route_count)
        if (mem_ipv4->size != mem_ipv6->size)
                return false;
 
+       /* Table offset and size must fit in TABLE_INIT command fields */
+       if (!ipa_cmd_table_init_valid(ipa, mem_ipv4, !filter))
+               return false;
+
        /* Make sure the regions are big enough */
        count = mem_ipv4->size / sizeof(__le64);
        if (count < 2)