From: Oliver Hartkopp <socketcan@hartkopp.net>
To: Dan Carpenter <dan.carpenter@oracle.com>,
Wolfgang Grandegger <wg@grandegger.com>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Leon Romanovsky <leon@kernel.org>,
Markus Plessing <plessing@ems-wuensche.com>,
linux-can@vger.kernel.org, netdev@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: Re: [PATCH v3 net] can: sja1000: fix use after free in ems_pcmcia_add_card()
Date: Wed, 24 Nov 2021 18:01:55 +0100 [thread overview]
Message-ID: <7a217190-1a4e-dfdd-65be-a751bf8403ff@hartkopp.net> (raw)
In-Reply-To: <20211124145041.GB13656@kili>
On 24.11.21 15:50, Dan Carpenter wrote:
> If the last channel is not available then "dev" is freed. Fortunately,
> we can just use "pdev->irq" instead.
>
> Also we should check if at least one channel was set up.
>
> Fixes: fd734c6f25ae ("can/sja1000: add driver for EMS PCMCIA card")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
Tested-by: Oliver Hartkopp <socketcan@hartkopp.net>
Thanks Dan!
> ---
> v3: add a check for if there is a channel.
> v2: fix a bug in v1. Only one channel is required but my patch returned
> if any channel was unavailable.
>
> drivers/net/can/sja1000/ems_pcmcia.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/can/sja1000/ems_pcmcia.c b/drivers/net/can/sja1000/ems_pcmcia.c
> index e21b169c14c0..4642b6d4aaf7 100644
> --- a/drivers/net/can/sja1000/ems_pcmcia.c
> +++ b/drivers/net/can/sja1000/ems_pcmcia.c
> @@ -234,7 +234,12 @@ static int ems_pcmcia_add_card(struct pcmcia_device *pdev, unsigned long base)
> free_sja1000dev(dev);
> }
>
> - err = request_irq(dev->irq, &ems_pcmcia_interrupt, IRQF_SHARED,
> + if (!card->channels) {
> + err = -ENODEV;
> + goto failure_cleanup;
> + }
> +
> + err = request_irq(pdev->irq, &ems_pcmcia_interrupt, IRQF_SHARED,
> DRV_NAME, card);
> if (!err)
> return 0;
>
prev parent reply other threads:[~2021-11-24 17:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-24 14:50 [PATCH v3 net] can: sja1000: fix use after free in ems_pcmcia_add_card() Dan Carpenter
2021-11-24 17:01 ` Oliver Hartkopp [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=7a217190-1a4e-dfdd-65be-a751bf8403ff@hartkopp.net \
--to=socketcan@hartkopp.net \
--cc=dan.carpenter@oracle.com \
--cc=davem@davemloft.net \
--cc=kernel-janitors@vger.kernel.org \
--cc=kuba@kernel.org \
--cc=leon@kernel.org \
--cc=linux-can@vger.kernel.org \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=plessing@ems-wuensche.com \
--cc=wg@grandegger.com \
/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