niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

net: ipa: validate memory regions unconditionally

Browse source 
Do memory region descriptor validation unconditionally, rather than
having it depend on IPA_VALIDATION being defined.

Pass the address of a memory region descriptor rather than a memory
ID to ipa_mem_valid().

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alex Elder 2021-06-09 17:34:55 -05:00 • committed by David S. Miller
parent 14ab6a208c
commit 0300df2d9d
1 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/net/ipa/ipa_mem.c
View file

@ -99,12 +99,10 @@ int ipa_mem_setup(struct ipa *ipa)
return 0;
}
#ifdef IPA_VALIDATE
static bool ipa_mem_valid(struct ipa *ipa, enum ipa_mem_id mem_id)
static bool ipa_mem_valid(struct ipa *ipa, const struct ipa_mem *mem)
{
const struct ipa_mem *mem = &ipa->mem[mem_id];
struct device *dev = &ipa->pdev->dev;
enum ipa_mem_id mem_id = mem->id;
u16 size_multiple;
/* Other than modem memory, sizes must be a multiple of 8 */
@ -128,15 +126,6 @@ static bool ipa_mem_valid(struct ipa *ipa, enum ipa_mem_id mem_id)
return false;
}
#else /* !IPA_VALIDATE */
static bool ipa_mem_valid(struct ipa *ipa, enum ipa_mem_id mem_id)
{
return true;
}
#endif /*! IPA_VALIDATE */
/**
* ipa_mem_config() - Configure IPA shared memory
* @ipa: IPA pointer
@ -188,7 +177,7 @@ int ipa_mem_config(struct ipa *ipa)
__le32 *canary;
/* Validate all regions (even undefined ones) */
if (!ipa_mem_valid(ipa, mem_id))
if (!ipa_mem_valid(ipa, mem))
goto err_dma_free;
/* Skip over undefined regions */