summary refs log tree commit diff
path: root/kernel
diff options
context:
space:
mode:
authorEugene Syromiatnikov <esyr@redhat.com>2020-04-12 22:31:23 +0200
committerChristian Brauner <christian.brauner@ubuntu.com>2020-04-15 09:56:25 +0200
commit62173872ca65767c586217dec0a32485da8a2f07 (patch)
treeaf488c4e93c0f2ce7d07b024ee946d2ea7cd3c30 /kernel
parente82a118f57b89bbb437ce70780fc2678d5c281e5 (diff)
downloadlinux-62173872ca65767c586217dec0a32485da8a2f07.tar.gz
clone3: add a check for the user struct size if CLONE_INTO_CGROUP is set
Passing CLONE_INTO_CGROUP with an under-sized structure (that doesn't
properly contain cgroup field) seems like garbage input, especially
considering the fact that fd 0 is a valid descriptor.

Signed-off-by: Eugene Syromiatnikov <esyr@redhat.com>
Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
Link: https://lore.kernel.org/r/20200412203123.GA5869@asgard.redhat.com
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/fork.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/fork.c b/kernel/fork.c
index b4f7775623c8..3ab7cf88e455 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -2631,7 +2631,8 @@ noinline static int copy_clone_args_from_user(struct kernel_clone_args *kargs,
 		     !valid_signal(args.exit_signal)))
 		return -EINVAL;
 
-	if ((args.flags & CLONE_INTO_CGROUP) && args.cgroup > INT_MAX)
+	if ((args.flags & CLONE_INTO_CGROUP) &&
+	    (args.cgroup > INT_MAX || usize < CLONE_ARGS_SIZE_VER2))
 		return -EINVAL;
 
 	*kargs = (struct kernel_clone_args){