From: Jarkko Nikula <jarkko.nikula@linux.intel.com>
To: Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Mark Brown <broonie@kernel.org>
Cc: linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org
Subject: Re: [PATCH] spi: spidev: fix possible NULL dereference
Date: Fri, 11 Sep 2015 15:11:32 +0300 [thread overview]
Message-ID: <55F2C4F4.3090704@linux.intel.com> (raw)
In-Reply-To: <1441883893-20596-1-git-send-email-sudipm.mukherjee@gmail.com>
Hi
On 09/10/2015 02:18 PM, Sudip Mukherjee wrote:
> During the last close we are freeing spidev if spidev->spi is NULL, but
> just before checking if spidev->spi is NULL we are dereferencing it.
> Lets add a check there to avoid the NULL dereference.
>
> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
> ---
> drivers/spi/spidev.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
> index fba92a5..ef008e5 100644
> --- a/drivers/spi/spidev.c
> +++ b/drivers/spi/spidev.c
> @@ -651,7 +651,8 @@ static int spidev_release(struct inode *inode, struct file *filp)
> kfree(spidev->rx_buffer);
> spidev->rx_buffer = NULL;
>
> - spidev->speed_hz = spidev->spi->max_speed_hz;
> + if (spidev->spi)
> + spidev->speed_hz = spidev->spi->max_speed_hz;
>
> /* ... after we unbound from the underlying device? */
> spin_lock_irq(&spidev->spi_lock);
Actually this fixes a *real* NULL dereference case but it is not related
to normal open/close life cycle of spidev. It requires that spidev is
kept open when SPI master is removed.
spidev->spi is set to NULL in spidev_remove() and it is called before
spidev_release() in case master is removed while spidev is in use
It would be good to update this to commit log, add a tag below and Cc
<stable@vger.kernel.org>
Fixes: 9169051617df ("spi: spidev: Don't mangle max_speed_hz in
underlying spi device")
You can add these too:
Reviewed-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Tested-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
next prev parent reply other threads:[~2015-09-11 12:11 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-10 11:18 [PATCH] spi: spidev: fix possible NULL dereference Sudip Mukherjee
2015-09-11 12:11 ` Jarkko Nikula [this message]
2015-09-11 12:25 ` Mark Brown
2015-09-11 12:49 ` Sudip Mukherjee
2015-09-11 14:21 ` Mark Brown
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=55F2C4F4.3090704@linux.intel.com \
--to=jarkko.nikula@linux.intel.com \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=sudipm.mukherjee@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox