From: Jarkko Nikula <jarkko.nikula-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
To: Sudip Mukherjee
<sudipm.mukherjee-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.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-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
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-ofJRbWXBVFamYgehrs7/Lw@public.gmane.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-u79uwXL29TY76Z2rM5mHXA@public.gmane.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-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
Tested-by: Jarkko Nikula <jarkko.nikula-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
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: 10+ 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-10 11:18 ` Sudip Mukherjee
[not found] ` <1441883893-20596-1-git-send-email-sudipm.mukherjee-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-09-11 12:11 ` Jarkko Nikula [this message]
2015-09-11 12:11 ` Jarkko Nikula
[not found] ` <55F2C4F4.3090704-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2015-09-11 12:25 ` Mark Brown
2015-09-11 12:25 ` Mark Brown
[not found] ` <20150911122513.GT12027-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2015-09-11 12:49 ` Sudip Mukherjee
2015-09-11 12:49 ` Sudip Mukherjee
2015-09-11 14:21 ` Mark Brown
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-vuqaysv1563yd54fqh9/ca@public.gmane.org \
--cc=broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=sudipm.mukherjee-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.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.