[PATCH] ASoC: amd: acp: drop bogus NULL check from i2s_irq_handler

Murad Masimov posted 1 patch 1 week ago
sound/soc/amd/acp/acp-platform.c | 3 ---
1 file changed, 3 deletions(-)
[PATCH] ASoC: amd: acp: drop bogus NULL check from i2s_irq_handler
Posted by Murad Masimov 1 week ago
When i2s_irq_handler is called, it's guaranteed that adata is not NULL,
since IRQ handlers are guaranteed to be provided with a valid data pointer.
Moreover, adata pointer is being dereferenced right before the NULL check,
which makes the check pointless, even if adata could be NULL.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Signed-off-by: Murad Masimov <m.masimov@maxima.ru>
---
 sound/soc/amd/acp/acp-platform.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sound/soc/amd/acp/acp-platform.c b/sound/soc/amd/acp/acp-platform.c
index 3a7a467b7063..ce712aea953d 100644
--- a/sound/soc/amd/acp/acp-platform.c
+++ b/sound/soc/amd/acp/acp-platform.c
@@ -142,9 +142,6 @@ static irqreturn_t i2s_irq_handler(int irq, void *data)
 	u16 i2s_flag = 0;
 	u32 ext_intr_stat, ext_intr_stat1;

-	if (!adata)
-		return IRQ_NONE;
-
 	if (adata->rsrc->no_of_ctrls == 2)
 		ext_intr_stat1 = readl(ACP_EXTERNAL_INTR_STAT(adata, (rsrc->irqp_used - 1)));

--
2.39.2
Re: [PATCH] ASoC: amd: acp: drop bogus NULL check from i2s_irq_handler
Posted by Mark Brown 6 days, 15 hours ago
On Tue, 01 Oct 2024 22:08:39 +0300, Murad Masimov wrote:
> When i2s_irq_handler is called, it's guaranteed that adata is not NULL,
> since IRQ handlers are guaranteed to be provided with a valid data pointer.
> Moreover, adata pointer is being dereferenced right before the NULL check,
> which makes the check pointless, even if adata could be NULL.
> 
> Found by Linux Verification Center (linuxtesting.org) with SVACE.
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: amd: acp: drop bogus NULL check from i2s_irq_handler
      commit: 8cd4e1f087b6906bacbbf8b637cac4e479a9cb34

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark