diff options
Diffstat (limited to 'security/selinux/hooks.c')
-rw-r--r-- | security/selinux/hooks.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index b1ac22d23195..19a385e9968e 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
@@ -653,11 +653,11 @@ static int superblock_doinit(struct super_block *sb, void *data) | |||
653 | sbsec->initialized = 1; | 653 | sbsec->initialized = 1; |
654 | 654 | ||
655 | if (sbsec->behavior > ARRAY_SIZE(labeling_behaviors)) { | 655 | if (sbsec->behavior > ARRAY_SIZE(labeling_behaviors)) { |
656 | printk(KERN_INFO "SELinux: initialized (dev %s, type %s), unknown behavior\n", | 656 | printk(KERN_ERR "SELinux: initialized (dev %s, type %s), unknown behavior\n", |
657 | sb->s_id, sb->s_type->name); | 657 | sb->s_id, sb->s_type->name); |
658 | } | 658 | } |
659 | else { | 659 | else { |
660 | printk(KERN_INFO "SELinux: initialized (dev %s, type %s), %s\n", | 660 | printk(KERN_DEBUG "SELinux: initialized (dev %s, type %s), %s\n", |
661 | sb->s_id, sb->s_type->name, | 661 | sb->s_id, sb->s_type->name, |
662 | labeling_behaviors[sbsec->behavior-1]); | 662 | labeling_behaviors[sbsec->behavior-1]); |
663 | } | 663 | } |
@@ -4434,7 +4434,7 @@ static int selinux_ipc_permission(struct kern_ipc_perm *ipcp, short flag) | |||
4434 | static int selinux_register_security (const char *name, struct security_operations *ops) | 4434 | static int selinux_register_security (const char *name, struct security_operations *ops) |
4435 | { | 4435 | { |
4436 | if (secondary_ops != original_ops) { | 4436 | if (secondary_ops != original_ops) { |
4437 | printk(KERN_INFO "%s: There is already a secondary security " | 4437 | printk(KERN_ERR "%s: There is already a secondary security " |
4438 | "module registered.\n", __FUNCTION__); | 4438 | "module registered.\n", __FUNCTION__); |
4439 | return -EINVAL; | 4439 | return -EINVAL; |
4440 | } | 4440 | } |
@@ -4451,7 +4451,7 @@ static int selinux_register_security (const char *name, struct security_operatio | |||
4451 | static int selinux_unregister_security (const char *name, struct security_operations *ops) | 4451 | static int selinux_unregister_security (const char *name, struct security_operations *ops) |
4452 | { | 4452 | { |
4453 | if (ops != secondary_ops) { | 4453 | if (ops != secondary_ops) { |
4454 | printk (KERN_INFO "%s: trying to unregister a security module " | 4454 | printk(KERN_ERR "%s: trying to unregister a security module " |
4455 | "that is not registered.\n", __FUNCTION__); | 4455 | "that is not registered.\n", __FUNCTION__); |
4456 | return -EINVAL; | 4456 | return -EINVAL; |
4457 | } | 4457 | } |
@@ -4889,9 +4889,9 @@ static __init int selinux_init(void) | |||
4889 | panic("SELinux: Unable to register with kernel.\n"); | 4889 | panic("SELinux: Unable to register with kernel.\n"); |
4890 | 4890 | ||
4891 | if (selinux_enforcing) { | 4891 | if (selinux_enforcing) { |
4892 | printk(KERN_INFO "SELinux: Starting in enforcing mode\n"); | 4892 | printk(KERN_DEBUG "SELinux: Starting in enforcing mode\n"); |
4893 | } else { | 4893 | } else { |
4894 | printk(KERN_INFO "SELinux: Starting in permissive mode\n"); | 4894 | printk(KERN_DEBUG "SELinux: Starting in permissive mode\n"); |
4895 | } | 4895 | } |
4896 | 4896 | ||
4897 | #ifdef CONFIG_KEYS | 4897 | #ifdef CONFIG_KEYS |
@@ -4907,10 +4907,10 @@ static __init int selinux_init(void) | |||
4907 | 4907 | ||
4908 | void selinux_complete_init(void) | 4908 | void selinux_complete_init(void) |
4909 | { | 4909 | { |
4910 | printk(KERN_INFO "SELinux: Completing initialization.\n"); | 4910 | printk(KERN_DEBUG "SELinux: Completing initialization.\n"); |
4911 | 4911 | ||
4912 | /* Set up any superblocks initialized prior to the policy load. */ | 4912 | /* Set up any superblocks initialized prior to the policy load. */ |
4913 | printk(KERN_INFO "SELinux: Setting up existing superblocks.\n"); | 4913 | printk(KERN_DEBUG "SELinux: Setting up existing superblocks.\n"); |
4914 | spin_lock(&sb_lock); | 4914 | spin_lock(&sb_lock); |
4915 | spin_lock(&sb_security_lock); | 4915 | spin_lock(&sb_security_lock); |
4916 | next_sb: | 4916 | next_sb: |
@@ -4968,9 +4968,9 @@ static int __init selinux_nf_ip_init(void) | |||
4968 | 4968 | ||
4969 | if (!selinux_enabled) | 4969 | if (!selinux_enabled) |
4970 | goto out; | 4970 | goto out; |
4971 | 4971 | ||
4972 | printk(KERN_INFO "SELinux: Registering netfilter hooks\n"); | 4972 | printk(KERN_DEBUG "SELinux: Registering netfilter hooks\n"); |
4973 | 4973 | ||
4974 | err = nf_register_hook(&selinux_ipv4_op); | 4974 | err = nf_register_hook(&selinux_ipv4_op); |
4975 | if (err) | 4975 | if (err) |
4976 | panic("SELinux: nf_register_hook for IPv4: error %d\n", err); | 4976 | panic("SELinux: nf_register_hook for IPv4: error %d\n", err); |
@@ -4992,7 +4992,7 @@ __initcall(selinux_nf_ip_init); | |||
4992 | #ifdef CONFIG_SECURITY_SELINUX_DISABLE | 4992 | #ifdef CONFIG_SECURITY_SELINUX_DISABLE |
4993 | static void selinux_nf_ip_exit(void) | 4993 | static void selinux_nf_ip_exit(void) |
4994 | { | 4994 | { |
4995 | printk(KERN_INFO "SELinux: Unregistering netfilter hooks\n"); | 4995 | printk(KERN_DEBUG "SELinux: Unregistering netfilter hooks\n"); |
4996 | 4996 | ||
4997 | nf_unregister_hook(&selinux_ipv4_op); | 4997 | nf_unregister_hook(&selinux_ipv4_op); |
4998 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) | 4998 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) |