]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: renesas: rz-ssi: Add a check for negative sample_space
authorDan Carpenter <dan.carpenter@linaro.org>
Wed, 8 Jan 2025 09:28:46 +0000 (12:28 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 7 Mar 2025 15:56:30 +0000 (16:56 +0100)
[ Upstream commit 82a0a3e6f8c02b3236b55e784a083fa4ee07c321 ]

My static checker rule complains about this code.  The concern is that
if "sample_space" is negative then the "sample_space >= runtime->channels"
condition will not work as intended because it will be type promoted to a
high unsigned int value.

strm->fifo_sample_size is SSI_FIFO_DEPTH (32).  The SSIFSR_TDC_MASK is
0x3f.  Without any further context it does seem like a reasonable warning
and it can't hurt to add a check for negatives.

Cc: stable@vger.kernel.org
Fixes: 03e786bd4341 ("ASoC: sh: Add RZ/G2L SSIF-2 driver")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://patch.msgid.link/e07c3dc5-d885-4b04-a742-71f42243f4fd@stanley.mountain
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/sh/rz-ssi.c

index 468050467bb39f05c8d9af1fc502dcbfb829c761..12e063c29a2ab0498cab26d8257bddfe144e73fd 100644 (file)
@@ -483,6 +483,8 @@ static int rz_ssi_pio_send(struct rz_ssi_priv *ssi, struct rz_ssi_stream *strm)
        sample_space = strm->fifo_sample_size;
        ssifsr = rz_ssi_reg_readl(ssi, SSIFSR);
        sample_space -= (ssifsr >> SSIFSR_TDC_SHIFT) & SSIFSR_TDC_MASK;
+       if (sample_space < 0)
+               return -EINVAL;
 
        /* Only add full frames at a time */
        while (frames_left && (sample_space >= runtime->channels)) {