Commit dafdcfba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jmorris/selinux-2.6 

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
  Always initialize scontext and scontext_len
  Reassign printk levels in selinux kernel code
parents c90c69a5 4f4acf3a

security/selinux/hooks.c

+12 −12
Original line number Diff line number Diff line
@@ -653,11 +653,11 @@ static int superblock_doinit(struct super_block *sb, void *data) 
	sbsec->initialized = 1;



	if (sbsec->behavior > ARRAY_SIZE(labeling_behaviors)) {

		printk(KERN_INFO "SELinux: initialized (dev %s, type %s), unknown behavior\n",

		printk(KERN_ERR "SELinux: initialized (dev %s, type %s), unknown behavior\n",

		       sb->s_id, sb->s_type->name);

	}

	else {

		printk(KERN_INFO "SELinux: initialized (dev %s, type %s), %s\n",

		printk(KERN_DEBUG "SELinux: initialized (dev %s, type %s), %s\n",

		       sb->s_id, sb->s_type->name,

		       labeling_behaviors[sbsec->behavior-1]);

	}
@@ -4434,7 +4434,7 @@ static int selinux_ipc_permission(struct kern_ipc_perm *ipcp, short flag) 
static int selinux_register_security (const char *name, struct security_operations *ops)

{

	if (secondary_ops != original_ops) {

		printk(KERN_INFO "%s:  There is already a secondary security "

		printk(KERN_ERR "%s:  There is already a secondary security "

		       "module registered.\n", __FUNCTION__);

		return -EINVAL;

 	}
@@ -4451,7 +4451,7 @@ static int selinux_register_security (const char *name, struct security_operatio 
static int selinux_unregister_security (const char *name, struct security_operations *ops)

{

	if (ops != secondary_ops) {

		printk (KERN_INFO "%s:  trying to unregister a security module "

		printk(KERN_ERR "%s:  trying to unregister a security module "

		        "that is not registered.\n", __FUNCTION__);

		return -EINVAL;

	}
@@ -4889,9 +4889,9 @@ static __init int selinux_init(void) 
		panic("SELinux: Unable to register with kernel.\n");



	if (selinux_enforcing) {

		printk(KERN_INFO "SELinux:  Starting in enforcing mode\n");

		printk(KERN_DEBUG "SELinux:  Starting in enforcing mode\n");

	} else {

		printk(KERN_INFO "SELinux:  Starting in permissive mode\n");

		printk(KERN_DEBUG "SELinux:  Starting in permissive mode\n");

	}



#ifdef CONFIG_KEYS
@@ -4907,10 +4907,10 @@ static __init int selinux_init(void) 


void selinux_complete_init(void)

{

	printk(KERN_INFO "SELinux:  Completing initialization.\n");

	printk(KERN_DEBUG "SELinux:  Completing initialization.\n");



	/* Set up any superblocks initialized prior to the policy load. */

	printk(KERN_INFO "SELinux:  Setting up existing superblocks.\n");

	printk(KERN_DEBUG "SELinux:  Setting up existing superblocks.\n");

	spin_lock(&sb_lock);

	spin_lock(&sb_security_lock);

next_sb:
@@ -4969,7 +4969,7 @@ static int __init selinux_nf_ip_init(void) 
	if (!selinux_enabled)

		goto out;



	printk(KERN_INFO "SELinux:  Registering netfilter hooks\n");

	printk(KERN_DEBUG "SELinux:  Registering netfilter hooks\n");



	err = nf_register_hook(&selinux_ipv4_op);

	if (err)
@@ -4992,7 +4992,7 @@ __initcall(selinux_nf_ip_init); 
#ifdef CONFIG_SECURITY_SELINUX_DISABLE

static void selinux_nf_ip_exit(void)

{

	printk(KERN_INFO "SELinux:  Unregistering netfilter hooks\n");

	printk(KERN_DEBUG "SELinux:  Unregistering netfilter hooks\n");



	nf_unregister_hook(&selinux_ipv4_op);

#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

security/selinux/ss/avtab.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ void avtab_hash_eval(struct avtab *h, char *tag) 
		}

	}



	printk(KERN_INFO "%s:  %d entries and %d/%d buckets used, longest "

	printk(KERN_DEBUG "%s:  %d entries and %d/%d buckets used, longest "

	       "chain length %d\n", tag, h->nel, slots_used, AVTAB_SIZE,

	       max_chain_len);

}

security/selinux/ss/policydb.c

+3 −3
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ static void symtab_hash_eval(struct symtab *s) 
		struct hashtab_info info;



		hashtab_stat(h, &info);

		printk(KERN_INFO "%s:  %d entries and %d/%d buckets used, "

		printk(KERN_DEBUG "%s:  %d entries and %d/%d buckets used, "

		       "longest chain length %d\n", symtab_name[i], h->nel,

		       info.slots_used, h->size, info.max_chain_len);

	}
@@ -391,14 +391,14 @@ static int policydb_index_others(struct policydb *p) 
{

	int i, rc = 0;



	printk(KERN_INFO "security:  %d users, %d roles, %d types, %d bools",

	printk(KERN_DEBUG "security:  %d users, %d roles, %d types, %d bools",

	       p->p_users.nprim, p->p_roles.nprim, p->p_types.nprim, p->p_bools.nprim);

	if (selinux_mls_enabled)

		printk(", %d sens, %d cats", p->p_levels.nprim,

		       p->p_cats.nprim);

	printk("\n");



	printk(KERN_INFO "security:  %d classes, %d rules\n",

	printk(KERN_DEBUG "security:  %d classes, %d rules\n",

	       p->p_classes.nprim, p->te_avtab.nel);



#ifdef DEBUG_HASHES

security/selinux/ss/services.c

+3 −0
Original line number Diff line number Diff line
@@ -609,6 +609,9 @@ int security_sid_to_context(u32 sid, char **scontext, u32 *scontext_len) 
	struct context *context;

	int rc = 0;



	*scontext = NULL;

	*scontext_len  = 0;



	if (!ss_initialized) {

		if (sid <= SECINITSID_NUM) {

			char *scontextp;

security/selinux/ss/sidtab.c

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ void sidtab_hash_eval(struct sidtab *h, char *tag) 
		}

	}



	printk(KERN_INFO "%s:  %d entries and %d/%d buckets used, longest "

	printk(KERN_DEBUG "%s:  %d entries and %d/%d buckets used, longest "

	       "chain length %d\n", tag, h->nel, slots_used, SIDTAB_SIZE,

	       max_chain_len);

}