diff options
| author | Alex Elder <elder@linaro.org> | 2021-09-07 12:05:54 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-22 12:27:57 +0200 |
| commit | 983ef866291cc7e51f151cdea5a7c2fe36f632a3 (patch) | |
| tree | 4c7f00374ea8dcdb6bb81f52bc4672063feab7ae | |
| parent | c5102ced8ac0a106182332de15ea2b2920581811 (diff) | |
| download | linux-stable-983ef866291cc7e51f151cdea5a7c2fe36f632a3.tar.gz linux-stable-983ef866291cc7e51f151cdea5a7c2fe36f632a3.tar.bz2 linux-stable-983ef866291cc7e51f151cdea5a7c2fe36f632a3.zip | |
net: ipa: initialize all filter table slots
commit b5c102238cea985d8126b173d06b9e1de88037ee upstream.
There is an off-by-one problem in ipa_table_init_add(), when
initializing filter tables.
In that function, the number of filter table entries is determined
based on the number of set bits in the filter map. However that
count does *not* include the extra "slot" in the filter table that
holds the filter map itself. Meanwhile, ipa_table_addr() *does*
include the filter map in the memory it returns, but because the
count it's provided doesn't include it, it includes one too few
table entries.
Fix this by including the extra slot for the filter map in the count
computed in ipa_table_init_add().
Note: ipa_filter_reset_table() does not have this problem; it resets
filter table entries one by one, but does not overwrite the filter
bitmap.
Fixes: 2b9feef2b6c2 ("soc: qcom: ipa: filter and routing tables")
Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/ipa/ipa_table.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ipa/ipa_table.c b/drivers/net/ipa/ipa_table.c index b3790aa952a1..0747866d60ab 100644 --- a/drivers/net/ipa/ipa_table.c +++ b/drivers/net/ipa/ipa_table.c @@ -451,7 +451,8 @@ static void ipa_table_init_add(struct gsi_trans *trans, bool filter, * table region determines the number of entries it has. */ if (filter) { - count = hweight32(ipa->filter_map); + /* Include one extra "slot" to hold the filter map itself */ + count = 1 + hweight32(ipa->filter_map); hash_count = hash_mem->size ? count : 0; } else { count = mem->size / IPA_TABLE_ENTRY_SIZE; |