On Tuesday, May 20, 2014 07:55:16 PM zhangdianfang wrote:
> Delete redundant if-condition code.
>
> Signed-off-by: Zhang Dianfang <zhangdianfang@xxxxxxxxxx>
> ---
> security/selinux/hooks.c | 4 ----
> 1 files changed, 0 insertions(+), 4 deletions(-)
>
> diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
> index 2c7341d..70afb3a 100644
> --- a/security/selinux/hooks.c
> +++ b/security/selinux/hooks.c
> @@ -5967,10 +5967,6 @@ static __init int selinux_init(void)
> {
> if (!security_module_enable(&selinux_ops)) {
> selinux_enabled = 0;
> - return 0;
> - }
> -
> - if (!selinux_enabled) {
> printk(KERN_INFO "SELinux: Disabled at boot.\n");
> return 0;
> }
NACK
We still need to check selinux_enabled if security_module_enable() returns
true.
--
paul moore
www.paul-moore.com
_______________________________________________
Selinux mailing list
Selinux@xxxxxxxxxxxxx
To unsubscribe, send email to Selinux-leave@xxxxxxxxxxxxx.
To get help, send an email containing "help" to Selinux-request@xxxxxxxxxxxxx.
