hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/IAZ996 CVE: NA ---------------------------------------------------------------------- Since struct audit_context and linux_binprm contains hole at the end, we can directly add one list without breaking KABI. Signed-off-by: Gu Bowen <gubowen5@huawei.com> --- include/linux/binfmts.h | 4 ++++ kernel/audit.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h index 330b194b66e7..a1924bb7b6f3 100644 --- a/include/linux/binfmts.h +++ b/include/linux/binfmts.h @@ -38,16 +38,20 @@ struct linux_binprm { * AT_SECURE auxv for glibc. */ secureexec:1, +#ifdef __GENKSYMS__ /* * Set when errors can no longer be returned to the * original userspace. */ + point_of_no_return:1; +#else point_of_no_return:1, /* * Set by user space to check executability according to the * caller's environment. */ is_check:1; +#endif struct file *executable; /* Executable to pass to the interpreter */ struct file *interpreter; struct file *file; diff --git a/kernel/audit.h b/kernel/audit.h index ab718ac899a2..981de76c394d 100644 --- a/kernel/audit.h +++ b/kernel/audit.h @@ -198,7 +198,9 @@ struct audit_context { struct open_how openat2; struct { int argc; +#ifndef __GENKSYMS__ bool is_check; +#endif } execve; struct { char *name; -- 2.25.1