clone3: add a check for the user struct size if CLONE_INTO_CGROUP is set
Subsystems (3)
PATCH 1/1 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 <[email protected]>
--- kernel/fork.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/fork.c +2 -1
@@ -2639,7 +2639,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 ){
Signature · 1 line
2.1.4
Quoted 5 lines · Eugene Syromiatnikov
Passing
CLONE_INTO_CGROUPwith 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 <[email protected]>
Thanks, will queue for rc2 unless I hear objections.
Christian Brauner
AppliedQuoted 6 lines · Eugene Syromiatnikov
Passing
CLONE_INTO_CGROUPwith 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 <[email protected]>
Applied, thanks!
Christian