diff options
| author | Vincent Stehlé <vincent.stehle@laposte.net> | 2019-04-14 17:37:26 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2020-11-15 15:49:07 +0100 |
| commit | d9ce517c5a8ed5e3e08e848abd1961e89f7bb30e (patch) | |
| tree | d409742d79344e59536dc45ad5c39eab723ce3bb | |
| parent | cfc79beb798f8891b07eabd852f0363e3485d4c6 (diff) | |
UPSTREAM: staging: android: vsoc: fix copy_from_user overrun
The `np->permission' structure is smaller than the `np' structure but
sizeof(*np) worth of data is copied in there. Fix the size passed to
copy_from_user() to avoid overrun.
Fixes: 3d2ec9dcd553 ("staging: Android: Add 'vsoc' driver for cuttlefish.")
Signed-off-by: Vincent Stehlé <vincent.stehle@laposte.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 060ea4271a82270be6d44e8e9aefe8f155fb5626)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I64af4102595050eb9062df7c75a509937f67549d
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
| -rw-r--r-- | drivers/staging/android/vsoc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/android/vsoc.c b/drivers/staging/android/vsoc.c index 954ed2c5d807..a9aa89cf8778 100644 --- a/drivers/staging/android/vsoc.c +++ b/drivers/staging/android/vsoc.c @@ -269,7 +269,8 @@ static int do_create_fd_scoped_permission( atomic_t *owner_ptr = NULL; struct vsoc_device_region *managed_region_p; - if (copy_from_user(&np->permission, &arg->perm, sizeof(*np)) || + if (copy_from_user(&np->permission, + &arg->perm, sizeof(np->permission)) || copy_from_user(&managed_fd, &arg->managed_region_fd, sizeof(managed_fd))) { return -EFAULT; |