Re: 2.6.36-rc7: kernel panic with SECURITY_TOMOYO=y

[KOSAKI Motohiro]

> From cc7601c18982909987bbb48971acb86a69a3317a Mon Sep 17 00:00:00 2001
> From: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
> Date: Fri, 8 Oct 2010 14:43:22 +0900
> Subject: [PATCH] TOMOYO: Print URL information before panic().
> 
> Configuration files for TOMOYO 2.3 are not compatible with TOMOYO 2.2.
> But current panic() message is too unfriendly and is confusing users.
> 
> Signed-off-by: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
> ---
>  security/tomoyo/common.c |   11 ++++++++++-
>  1 files changed, 10 insertions(+), 1 deletions(-)
> 
> diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c
> index c668b44..1f0d45a 100644
> --- a/security/tomoyo/common.c
> +++ b/security/tomoyo/common.c
> @@ -2051,13 +2051,22 @@ void tomoyo_check_profile(void)
>  		const u8 profile = domain->profile;
>  		if (tomoyo_profile_ptr[profile])
>  			continue;
> +		printk(KERN_ERR "You need to define profile %u before using it.\n",
> +		       profile);
> +		printk(KERN_ERR "Please see http://tomoyo.sourceforge.jp/2.3/ "
> +		       "for more information.\n");
>  		panic("Profile %u (used by '%s') not defined.\n",
>  		      profile, domain->domainname->name);
>  	}
>  	tomoyo_read_unlock(idx);
> -	if (tomoyo_profile_version != 20090903)
> +	if (tomoyo_profile_version != 20090903) {
> +		printk(KERN_ERR "You need to install userland programs for "
> +		       "TOMOYO 2.3 and initialize policy configuration.\n");
> +		printk(KERN_ERR "Please see http://tomoyo.sourceforge.jp/2.3/ "
> +		       "for more information.\n");
>  		panic("Profile version %u is not supported.\n",
>  		      tomoyo_profile_version);
> +	}
>  	printk(KERN_INFO "TOMOYO: 2.3.0\n");
>  	printk(KERN_INFO "Mandatory Access Control activated.\n");
>  }
> -- 
> 1.7.1


Looks good to me. thanks.
	Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/