From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BFA8122FDFA for ; Mon, 10 Feb 2025 13:49:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739195344; cv=none; b=V8NB0yCclYh5dOB9cEIEOc5Oq18wH9dzpE3RNhiReK9J+i49kbketKACVuV0xKNhHPVcPr60klqUpGDAaoAWbSj4lxYJmLx+DNZJJaZH9uvRyyS2NKQLMwX7bOxFdLnZA6GC0H+C0Lsyh6TL9AII9r+MTqvoVuHQ43p4tA+2J4s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739195344; c=relaxed/simple; bh=OwJpQKT1v01tO/SVYEu0vDEUCJ81UycsCEg0c4KfZrI=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=bw4Y4Kxj/6IZY2zyi+RcbB6X6pCgpcDm9wZmU+uJI9GEZdlqH09BaGJuqnuR0XsXb2Eo/sm0k5POqM85+0cXThLKRa/z47vqEjTwnOfXJmS6Cbv9Dr6zopRfGJIxSnm4EYquzabenOSw8QCtcVS89JPnk6gCPUVCrpWGMr8mMS4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=UConwIfO; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="UConwIfO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A29CFC4CED1; Mon, 10 Feb 2025 13:49:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1739195344; bh=OwJpQKT1v01tO/SVYEu0vDEUCJ81UycsCEg0c4KfZrI=; h=Subject:To:Cc:From:Date:From; b=UConwIfOldO/+H+SeKn9RIfRuCp+qRRL+8UmnIEPWj8jjeLAE2XiJW38GT3wEF9Zs EXrzLxtKTvYTITPANfb48c22IhcK3iSHm0fkab7NRPmmgA7btD7cprO0FOrWRZuSHH 95ghSPFp9mgv9YMytl7g7U1uiwOO+VSZdcS4W8i4= Subject: FAILED: patch "[PATCH] ASoC: renesas: rz-ssi: Add a check for negative sample_space" failed to apply to 6.1-stable tree To: dan.carpenter@linaro.org,broonie@kernel.org,geert+renesas@glider.be Cc: From: Date: Mon, 10 Feb 2025 14:48:53 +0100 Message-ID: <2025021053-entourage-retinal-b994@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 82a0a3e6f8c02b3236b55e784a083fa4ee07c321 # git commit -s git send-email --to '' --in-reply-to '2025021053-entourage-retinal-b994@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 82a0a3e6f8c02b3236b55e784a083fa4ee07c321 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 8 Jan 2025 12:28:46 +0300 Subject: [PATCH] ASoC: renesas: rz-ssi: Add a check for negative sample_space 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 Reviewed-by: Geert Uytterhoeven Link: https://patch.msgid.link/e07c3dc5-d885-4b04-a742-71f42243f4fd@stanley.mountain Signed-off-by: Mark Brown diff --git a/sound/soc/renesas/rz-ssi.c b/sound/soc/renesas/rz-ssi.c index d48e2e7356b6..3a0af4ca7ab6 100644 --- a/sound/soc/renesas/rz-ssi.c +++ b/sound/soc/renesas/rz-ssi.c @@ -521,6 +521,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)) {