diff options
| author | Alex Elder <elder@linaro.org> | 2020-12-03 15:51:06 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-21 13:28:14 +0100 |
| commit | 2882ad564be88707cdf6942fb48332bad97d1df2 (patch) | |
| tree | 30aaa6366bc6091b4bdead7359f585e05df7a362 | |
| parent | aefe6e4a088d0f4976393ee99b96a4392c0d9938 (diff) | |
| download | linux-stable-2882ad564be88707cdf6942fb48332bad97d1df2.tar.gz linux-stable-2882ad564be88707cdf6942fb48332bad97d1df2.tar.bz2 linux-stable-2882ad564be88707cdf6942fb48332bad97d1df2.zip | |
net: ipa: pass the correct size when freeing DMA memory
[ Upstream commit 1130b252480f3c98cf468e78c1c5c516b390a29c ]
When the coherent memory is freed in gsi_trans_pool_exit_dma(), we
are mistakenly passing the size of a single element in the pool
rather than the actual allocated size. Fix this bug.
Fixes: 9dd441e4ed575 ("soc: qcom: ipa: GSI transactions")
Reported-by: Stephen Boyd <swboyd@chromium.org>
Tested-by: Sujit Kautkar <sujitka@chromium.org>
Signed-off-by: Alex Elder <elder@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20201203215106.17450-1-elder@linaro.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/ipa/gsi_trans.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/ipa/gsi_trans.c b/drivers/net/ipa/gsi_trans.c index c7dafd126e40..24b7c9602e68 100644 --- a/drivers/net/ipa/gsi_trans.c +++ b/drivers/net/ipa/gsi_trans.c @@ -157,6 +157,9 @@ int gsi_trans_pool_init_dma(struct device *dev, struct gsi_trans_pool *pool, /* The allocator will give us a power-of-2 number of pages. But we * can't guarantee that, so request it. That way we won't waste any * memory that would be available beyond the required space. + * + * Note that gsi_trans_pool_exit_dma() assumes the total allocated + * size is exactly (count * size). */ total_size = get_order(total_size) << PAGE_SHIFT; @@ -176,7 +179,9 @@ int gsi_trans_pool_init_dma(struct device *dev, struct gsi_trans_pool *pool, void gsi_trans_pool_exit_dma(struct device *dev, struct gsi_trans_pool *pool) { - dma_free_coherent(dev, pool->size, pool->base, pool->addr); + size_t total_size = pool->count * pool->size; + + dma_free_coherent(dev, total_size, pool->base, pool->addr); memset(pool, 0, sizeof(*pool)); } |