| Message ID | 20210907170554.399108-1-elder@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | [net] net: ipa: initialize all filter table slots | expand |
Hello: This patch was applied to netdev/net.git (refs/heads/master): On Tue, 7 Sep 2021 12:05:54 -0500 you wrote: > 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. > > [...] Here is the summary with links: - [net] net: ipa: initialize all filter table slots https://git.kernel.org/netdev/net/c/b5c102238cea You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/ipa/ipa_table.c b/drivers/net/ipa/ipa_table.c index 2324e1b93e37d..1da334f54944a 100644 --- a/drivers/net/ipa/ipa_table.c +++ b/drivers/net/ipa/ipa_table.c @@ -430,7 +430,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 / sizeof(__le64);
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> --- drivers/net/ipa/ipa_table.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.27.0