Commit 3558649e authored by Daniel Rosenberg's avatar Daniel Rosenberg Committed by Kleber Sacilotto de Souza

staging: android: ion: check for kref overflow

BugLink: https://bugs.launchpad.net/bugs/1792377

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.
4c23cbff ("staging: android: ion: Remove import interface")

Userspace can cause the kref to handles to increment
arbitrarily high. Ensure it does not overflow.
Signed-off-by: default avatarDaniel Rosenberg <drosen@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent b07a6b49
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
* *
*/ */
#include <linux/atomic.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/file.h> #include <linux/file.h>
...@@ -387,6 +388,16 @@ static void ion_handle_get(struct ion_handle *handle) ...@@ -387,6 +388,16 @@ static void ion_handle_get(struct ion_handle *handle)
kref_get(&handle->ref); 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) static int ion_handle_put_nolock(struct ion_handle *handle)
{ {
int ret; int ret;
...@@ -433,9 +444,9 @@ static struct ion_handle *ion_handle_get_by_id_nolock(struct ion_client *client, ...@@ -433,9 +444,9 @@ static struct ion_handle *ion_handle_get_by_id_nolock(struct ion_client *client,
handle = idr_find(&client->idr, id); handle = idr_find(&client->idr, id);
if (handle) if (handle)
ion_handle_get(handle); return ion_handle_get_check_overflow(handle);
return handle ? handle : ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
struct ion_handle *ion_handle_get_by_id(struct ion_client *client, struct ion_handle *ion_handle_get_by_id(struct ion_client *client,
...@@ -1202,7 +1213,7 @@ struct ion_handle *ion_import_dma_buf(struct ion_client *client, int fd) ...@@ -1202,7 +1213,7 @@ struct ion_handle *ion_import_dma_buf(struct ion_client *client, int fd)
/* if a handle exists for this buffer just take a reference to it */ /* if a handle exists for this buffer just take a reference to it */
handle = ion_handle_lookup(client, buffer); handle = ion_handle_lookup(client, buffer);
if (!IS_ERR(handle)) { if (!IS_ERR(handle)) {
ion_handle_get(handle); handle = ion_handle_get_check_overflow(handle);
mutex_unlock(&client->lock); mutex_unlock(&client->lock);
goto end; goto end;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment