From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Daniel Rosenberg <drosen@google.com>
Cc: stable@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-team@android.com
Subject: Re: [PATCH] staging: android: ion: check for kref overflow
Date: Tue, 21 Aug 2018 07:13:36 +0200 [thread overview]
Message-ID: <20180821051336.GA23394@kroah.com> (raw)
In-Reply-To: <20180821013057.139644-1-drosen@google.com>
On Mon, Aug 20, 2018 at 06:30:57PM -0700, Daniel Rosenberg wrote:
> Userspace can cause the kref to handles to increment
> arbitrarily high. Ensure it does not overflow.
>
> Signed-off-by: Daniel Rosenberg <drosen@google.com>
> ---
>
> This patch is against 4.4. It does not apply to master due to a large
> rework of ion in 4.12 which removed the affected functions altogther.
> It applies from 3.18 to 4.11, although with a trivial conflict resolution
> for the later branches.
> 4c23cbff073f3b9b ("staging: android: ion: Remove import interface")
>
> drivers/staging/android/ion/ion.c | 16 +++++++++++++---
> 1 file changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
> index 374f840f31a48..11f93a6314fdb 100644
> --- a/drivers/staging/android/ion/ion.c
> +++ b/drivers/staging/android/ion/ion.c
> @@ -15,6 +15,7 @@
> *
> */
>
> +#include <linux/atomic.h>
> #include <linux/device.h>
> #include <linux/err.h>
> #include <linux/file.h>
> @@ -387,6 +388,15 @@ static void ion_handle_get(struct ion_handle *handle)
> kref_get(&handle->ref);
> }
>
> +/* Must hold the client lock */
> +static struct ion_handle *ion_handle_get_check_overflow(
> + struct ion_handle *handle)
> +{
> + if (atomic_read(&handle->ref.refcount) + 1 == 0)
> + return ERR_PTR(-EOVERFLOW);
> + ion_handle_get(handle);
> + return handle;
> +}
> +
> static int ion_handle_put_nolock(struct ion_handle *handle)
> {
> int ret;
I tried to apply this patch, but it looks like you hand-edited it which
made it impossible to apply. Did you do that, or did git really create
this broken diff exactly as-is?
Try applying this patch yourself, you will see the error. I could fix
it by manually editing the diff metadata but I really shouldn't have to
as that implies you did not test the patch you sent me :(
thanks,
greg k-h
next prev parent reply other threads:[~2018-08-21 8:32 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-21 1:30 [PATCH] staging: android: ion: check for kref overflow Daniel Rosenberg
2018-08-21 5:13 ` Greg Kroah-Hartman [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-08-30 23:09 Daniel Rosenberg
2018-08-31 0:41 ` Greg Kroah-Hartman
2018-08-31 1:36 ` Daniel Rosenberg
2018-08-31 15:56 ` Greg Kroah-Hartman
2018-08-31 21:31 ` Daniel Rosenberg
2018-09-03 16:31 ` Greg Kroah-Hartman
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=20180821051336.GA23394@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=drosen@google.com \
--cc=kernel-team@android.com \
--cc=linux-kernel@vger.kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).