clone3: add build-time CLONE_ARGS_SIZE_VER* validity checks
Subsystems (3)
PATCH 1/1 clone3: add build-time CLONE_ARGS_SIZE_VER* validity checks
CLONE_ARGS_SIZE_VER* macros are defined explicitly and not via the offsets of the relevant struct clone_args fields, which makes it rather error-prone, so it probably makes sense to add some compile-time checks for them (including the one that breaks on struct clone_args extension as a reminder to add a relevant size macro and a similar check). Function copy_clone_args_from_user seems to be a good place for such checks.
--- kernel/fork.c | 8 ++++++++ 1 file changed, 8 insertions(+)
kernel/fork.c +8 -0
@@ -2605,6 +2605,14 @@ noinline static int copy_clone_args_from_user(struct kernel_clone_args *kargs,struct clone_args args;pid_t *kset_tid = kargs->set_tid; + BUILD_BUG_ON(offsetofend(struct clone_args, tls) != +CLONE_ARGS_SIZE_VER0 ); + BUILD_BUG_ON(offsetofend(struct clone_args, set_tid_size) != +CLONE_ARGS_SIZE_VER1 ); + BUILD_BUG_ON(offsetofend(struct clone_args, cgroup) != +CLONE_ARGS_SIZE_VER2 ); +BUILD_BUG_ON (sizeof (struct clone_args ) !=CLONE_ARGS_SIZE_VER2 ); +if (unlikely (usize >PAGE_SIZE ))return -E2BIG ;if (unlikely (usize <CLONE_ARGS_SIZE_VER0 ))
Signature · 1 line
2.1.4
Quoted 9 lines · Eugene Syromiatnikov
CLONE_ARGS_SIZE_VER* macros are defined explicitly and not via the offsets of the relevant struct
clone_argsfields, which makes it rather error-prone, so it probably makes sense to add some compile-time checks for them (including the one that breaks on structclone_argsextension as a reminder to add a relevant size macro and a similar check). Functioncopy_clone_args_from_userseems to be a good place for such checks.Signed-off-by Eugene Syromiatnikov <[email protected]>
Yeah, that seems like a good idea to me. Thanks, will queue for rc2 unless I hear objections.
Christian Brauner
AppliedQuoted 10 lines · Eugene Syromiatnikov
CLONE_ARGS_SIZE_VER* macros are defined explicitly and not via the offsets of the relevant struct
clone_argsfields, which makes it rather error-prone, so it probably makes sense to add some compile-time checks for them (including the one that breaks on structclone_argsextension as a reminder to add a relevant size macro and a similar check). Functioncopy_clone_args_from_userseems to be a good place for such checks.Signed-off-by Eugene Syromiatnikov <[email protected]>
Applied, thanks!
Christian