From: Jonathan Cameron <jic23@kernel.org>
To: Sven Van Asbroeck <thesven73@gmail.com>
Cc: Hartmut Knaack <knaack.h@gmx.de>,
Lars-Peter Clausen <lars@metafoo.de>,
Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
Michal Simek <michal.simek@xilinx.com>,
Manish Narani <manish.narani@xilinx.com>,
linux-iio@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/3] iio: adc: xilinx: fix potential use-after-free on probe
Date: Sat, 16 Mar 2019 15:49:21 +0000 [thread overview]
Message-ID: <20190316154921.1745de59@archlinux> (raw)
In-Reply-To: <20190310185826.25916-2-TheSven73@gmail.com>
On Sun, 10 Mar 2019 14:58:25 -0400
Sven Van Asbroeck <thesven73@gmail.com> wrote:
> If probe errors out after request_irq(), its error path
> does not explicitly cancel the delayed work, which may
> have been scheduled by the interrupt handler.
>
> This means the delayed work may still be running when
> the core frees the private structure (struct xadc).
> This is a potential use-after-free.
>
> Fix by inserting cancel_delayed_work_sync() in the probe
> error path.
>
> Signed-off-by: Sven Van Asbroeck <TheSven73@gmail.com>
Again, seems fine to me.
Applied to the fixes-togreg branch of iio.git.
thanks,
Jonathan
> ---
> drivers/iio/adc/xilinx-xadc-core.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c
> index 1960694e8007..15e1a103f37d 100644
> --- a/drivers/iio/adc/xilinx-xadc-core.c
> +++ b/drivers/iio/adc/xilinx-xadc-core.c
> @@ -1290,6 +1290,7 @@ static int xadc_probe(struct platform_device *pdev)
>
> err_free_irq:
> free_irq(xadc->irq, indio_dev);
> + cancel_delayed_work_sync(&xadc->zynq_unmask_work);
> err_clk_disable_unprepare:
> clk_disable_unprepare(xadc->clk);
> err_free_samplerate_trigger:
WARNING: multiple messages have this Message-ID (diff)
From: Jonathan Cameron <jic23@kernel.org>
To: Sven Van Asbroeck <thesven73@gmail.com>
Cc: Lars-Peter Clausen <lars@metafoo.de>,
linux-iio@vger.kernel.org, Michal Simek <michal.simek@xilinx.com>,
linux-kernel@vger.kernel.org,
Manish Narani <manish.narani@xilinx.com>,
Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
Hartmut Knaack <knaack.h@gmx.de>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 2/3] iio: adc: xilinx: fix potential use-after-free on probe
Date: Sat, 16 Mar 2019 15:49:21 +0000 [thread overview]
Message-ID: <20190316154921.1745de59@archlinux> (raw)
In-Reply-To: <20190310185826.25916-2-TheSven73@gmail.com>
On Sun, 10 Mar 2019 14:58:25 -0400
Sven Van Asbroeck <thesven73@gmail.com> wrote:
> If probe errors out after request_irq(), its error path
> does not explicitly cancel the delayed work, which may
> have been scheduled by the interrupt handler.
>
> This means the delayed work may still be running when
> the core frees the private structure (struct xadc).
> This is a potential use-after-free.
>
> Fix by inserting cancel_delayed_work_sync() in the probe
> error path.
>
> Signed-off-by: Sven Van Asbroeck <TheSven73@gmail.com>
Again, seems fine to me.
Applied to the fixes-togreg branch of iio.git.
thanks,
Jonathan
> ---
> drivers/iio/adc/xilinx-xadc-core.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c
> index 1960694e8007..15e1a103f37d 100644
> --- a/drivers/iio/adc/xilinx-xadc-core.c
> +++ b/drivers/iio/adc/xilinx-xadc-core.c
> @@ -1290,6 +1290,7 @@ static int xadc_probe(struct platform_device *pdev)
>
> err_free_irq:
> free_irq(xadc->irq, indio_dev);
> + cancel_delayed_work_sync(&xadc->zynq_unmask_work);
> err_clk_disable_unprepare:
> clk_disable_unprepare(xadc->clk);
> err_free_samplerate_trigger:
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-03-16 15:49 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-10 18:58 [PATCH 1/3] iio: adc: xilinx: fix potential use-after-free on remove Sven Van Asbroeck
2019-03-10 18:58 ` Sven Van Asbroeck
2019-03-10 18:58 ` [PATCH 2/3] iio: adc: xilinx: fix potential use-after-free on probe Sven Van Asbroeck
2019-03-10 18:58 ` Sven Van Asbroeck
2019-03-16 15:49 ` Jonathan Cameron [this message]
2019-03-16 15:49 ` Jonathan Cameron
2019-03-10 18:58 ` [PATCH 3/3] iio: adc: xilinx: prevent touching unclocked h/w on remove Sven Van Asbroeck
2019-03-10 18:58 ` Sven Van Asbroeck
2019-03-16 15:51 ` Jonathan Cameron
2019-03-16 15:51 ` Jonathan Cameron
2019-03-17 16:07 ` Sven Van Asbroeck
2019-03-17 16:07 ` Sven Van Asbroeck
2019-03-16 15:47 ` [PATCH 1/3] iio: adc: xilinx: fix potential use-after-free " Jonathan Cameron
2019-03-16 15:47 ` Jonathan Cameron
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=20190316154921.1745de59@archlinux \
--to=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=manish.narani@xilinx.com \
--cc=michal.simek@xilinx.com \
--cc=pmeerw@pmeerw.net \
--cc=thesven73@gmail.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 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.