]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
staging: android: vsoc: fix copy_from_user overrun
authorVincent Stehlé <vincent.stehle@laposte.net>
Sun, 14 Apr 2019 15:37:26 +0000 (17:37 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Jan 2020 13:50:39 +0000 (14:50 +0100)
[ Upstream commit 060ea4271a82270be6d44e8e9aefe8f155fb5626 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/staging/android/vsoc.c

index 22571abcaa4e88c0a141adf42f2a899c5669303e..034d86869772ef5bad01829e2764f9bce61820c1 100644 (file)
@@ -260,7 +260,8 @@ do_create_fd_scoped_permission(struct vsoc_device_region *region_p,
        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;