Skip to content

Commit 4543b1b

Browse files
Dan Carpentergregkh
authored andcommitted
ASoC: renesas: rz-ssi: Add a check for negative sample_space
[ Upstream commit 82a0a3e ] 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: 03e786b ("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>
1 parent fffb4a3 commit 4543b1b

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

sound/soc/sh/rz-ssi.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -528,6 +528,8 @@ static int rz_ssi_pio_send(struct rz_ssi_priv *ssi, struct rz_ssi_stream *strm)
528528
sample_space = strm->fifo_sample_size;
529529
ssifsr = rz_ssi_reg_readl(ssi, SSIFSR);
530530
sample_space -= (ssifsr >> SSIFSR_TDC_SHIFT) & SSIFSR_TDC_MASK;
531+
if (sample_space < 0)
532+
return -EINVAL;
531533

532534
/* Only add full frames at a time */
533535
while (frames_left && (sample_space >= runtime->channels)) {

0 commit comments

Comments
 (0)