On Wed, May 15, 2019 at 4:00 AM Tetsuo Handa
<
penguin...@i-love.sakura.ne.jp> wrote:
>
> On 2019/05/14 6:59, Tetsuo Handa wrote:
> > Excuse me, but will you revert aa8482aa8acbe261c9413fd4179e8163069b7605 until
> > c367dc8d0dd2a1e1ed9fdc2dd831053bdfdf0968 gets propagated to targets with CONFIG_SECURITY_TOMOYO=y ?
>
> An approach to handle this transition period would be to use
> CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER=n and CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING=y
> in the default kernel config file.
>
> diff --git a/dashboard/config/upstream-kasan.config b/dashboard/config/upstream-kasan.config
> index c0f054de..673d6fa6 100644
> --- a/dashboard/config/upstream-kasan.config
> +++ b/dashboard/config/upstream-kasan.config
> @@ -5598,7 +5598,9 @@ CONFIG_SECURITY_SMACK_NETFILTER=y
> CONFIG_SECURITY_TOMOYO=y
> CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=1024
> CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=32
> -CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER=y
> +# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
> +CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
> +CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
> CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING=y
> CONFIG_SECURITY_APPARMOR=y
> CONFIG_SECURITY_APPARMOR_HASH=y
>
> If CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING is available, "make" will update the .config file to include
> both CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER=y and CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING=y lines.
>
> If CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING is not available, "make" will update the .config file to
> discard CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING=y line.
>
> As a result, the kernel will be built with CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER=y
> only if CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING is available.
+syzkaller mailing list so that it's possible reference this in commit message