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: 3d2ec9dcd5 ("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 060ea4271a)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I61d1fd2029ac1ee9935b79f31b7f1906419f3f4d
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Vincent Stehlé
2019-04-14 17:37:26 +02:00
committed by Chris
parent c1e73592b0
commit e2d0f9c041

View File

@@ -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;