From: Dan Carpenter <error27@gmail.com>
To: christian.taedcke@weidmueller.com
Cc: Vinod Koul <vkoul@kernel.org>, Frank Li <Frank.Li@kernel.org>,
christian.taedcke-oss@weidmueller.com, dmaengine@vger.kernel.org,
linux-kernel@vger.kernel.org, stable@vger.kernel.org
Subject: Re: [PATCH] dmaengine: nbpfaxi: Fix setting channel irqs in probe()
Date: Thu, 9 Jul 2026 13:27:11 +0300 [thread overview]
Message-ID: <ak93fxRvw9UvxJLJ@stanley.mountain> (raw)
In-Reply-To: <20260702-upstreaming-nbpfaxi-v1-v1-1-fd8ea8830cea@weidmueller.com>
On Thu, Jul 02, 2026 at 03:43:29PM +0200, Christian Taedcke via B4 Relay wrote:
> From: Christian Taedcke <christian.taedcke@weidmueller.com>
>
> When one irq is used for errors and each channel gets a dedicated irq,
> the total number of irqs is num_channels + 1. If the error irq is not
> the last entry in irqbuf[] but an earlier one, the loop assigning
> per-channel irqs terminates one iteration too early and the last
> channel is left without an irq.
>
> Iterate over all collected irqs instead of num_channels so the
> error-irq skip does not shorten the effective channel count.
>
> Fixes: 188c6ba1dd92 ("dmaengine: nbpfaxi: Fix memory corruption in probe()")
> Cc: stable@vger.kernel.org
> Signed-off-by: Christian Taedcke <christian.taedcke@weidmueller.com>
> ---
> drivers/dma/nbpfaxi.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/dma/nbpfaxi.c b/drivers/dma/nbpfaxi.c
> index 05d7321629cc..74ff7bd979e2 100644
> --- a/drivers/dma/nbpfaxi.c
> +++ b/drivers/dma/nbpfaxi.c
> @@ -1374,7 +1374,7 @@ static int nbpf_probe(struct platform_device *pdev)
> if (irqs == num_channels + 1) {
> struct nbpf_channel *chan;
>
> - for (i = 0, chan = nbpf->chan; i < num_channels;
> + for (i = 0, chan = nbpf->chan; i < irqs;
> i++, chan++) {
> /* Skip the error IRQ */
> if (irqbuf[i] == eirq)
>
> ---
Ah. Thanks. I feel like it would make sense to change the other
condition as well to:
- for (i = 0, chan = nbpf->chan; i < num_channels;
+ for (i = 0, chan = nbpf->chan; i < irqs;
i++, chan++) {
/* Skip the error IRQ */
if (irqbuf[i] == eirq)
i++;
- if (i >= ARRAY_SIZE(irqbuf))
+ if (i >= num_channels)
return -EINVAL;
chan->irq = irqbuf[i];
If we don't find the error IRQ then it would be possible to go out of
bounds of the chan->irq. It's not likely to happen in real life but it
sort of makes the code make more sense?
regards,
dan carpenter
prev parent reply other threads:[~2026-07-09 10:27 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-02 13:43 [PATCH] dmaengine: nbpfaxi: Fix setting channel irqs in probe() Christian Taedcke via B4 Relay
2026-07-02 13:43 ` Christian Taedcke
2026-07-02 13:57 ` sashiko-bot
2026-07-09 10:27 ` Dan Carpenter [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ak93fxRvw9UvxJLJ@stanley.mountain \
--to=error27@gmail.com \
--cc=Frank.Li@kernel.org \
--cc=christian.taedcke-oss@weidmueller.com \
--cc=christian.taedcke@weidmueller.com \
--cc=dmaengine@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.