From: Wentao Liang <vulab@iscas.ac.cn>
To: "Marc Kleine-Budde" <mkl@pengutronix.de>,
"Vincent Mailhol" <mailhol@kernel.org>,
"Stéphane Grosjean" <s.grosjean@peak-system.fr>
Cc: linux-can@vger.kernel.org, linux-kernel@vger.kernel.org,
Wentao Liang <vulab@iscas.ac.cn>,
stable@vger.kernel.org
Subject: [PATCH] can: sja1000: fix netdev leak for non-contiguous channels
Date: Tue, 3 Nov 2026 10:05:28 +0000 [thread overview]
Message-ID: <20261103100528.1309863-1-vulab@iscas.ac.cn> (raw)
pcan_add_channels() stores a registered net_device at card->channel[i],
where i is the hardware channel index, but only increments
card->chan_count by one. When a lower channel is absent or fails to
register and a higher one succeeds, chan_count no longer covers the
used slot. pcan_free_channels() then iterates only up to chan_count and
leaks the net_device of the higher channel; the LED timer and the
interrupt handler also skip it.
Record the highest used channel index plus one in chan_count so that
every iterator covers all channel slots.
Fixes: 2b61972b7421 ("can: sja1000: add support for PEAK-System PCMCIA card")
Cc: stable@vger.kernel.org
Assisted-by: DeepSeek-V4.1-Flash and OpenAI Codex
Signed-off-by: Wentao Liang <vulab@iscas.ac.cn>
---
drivers/net/can/sja1000/peak_pcmcia.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/can/sja1000/peak_pcmcia.c b/drivers/net/can/sja1000/peak_pcmcia.c
index c3c2aa21da47..bba51dd808f8 100644
--- a/drivers/net/can/sja1000/peak_pcmcia.c
+++ b/drivers/net/can/sja1000/peak_pcmcia.c
@@ -574,7 +574,7 @@ static int pcan_add_channels(struct pcan_pccard *card)
}
card->channel[i].netdev = netdev;
- card->chan_count++;
+ card->chan_count = i + 1;
/* set corresponding led on in the new ccr */
ccr &= ~PCC_CCR_LED_OFF_CHAN(i);
--
2.34.1
next reply other threads:[~2026-11-03 10:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-03 10:05 Wentao Liang [this message]
2026-11-03 10:26 ` Krzysztof Kozlowski
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=20261103100528.1309863-1-vulab@iscas.ac.cn \
--to=vulab@iscas.ac.cn \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mailhol@kernel.org \
--cc=mkl@pengutronix.de \
--cc=s.grosjean@peak-system.fr \
--cc=stable@vger.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®