selinux: policydb - fix some checkpatch.pl warnings (2492acaf) · Commits · 戴 / test

security/selinux/ss/policydb.c

+8 −4

Original line number	Diff line number	Diff line
		@@ -334,6 +334,7 @@ static int (destroy_f[SYM_NUM]) (void key, void datum, void datap) =
		static int filenametr_destroy(void key, void datum, void *p)
		{
		struct filename_trans *ft = key;

		kfree(ft->name);
		kfree(key);
		kfree(datum);
		@@ -344,6 +345,7 @@ static int filenametr_destroy(void key, void datum, void *p)
		static int range_tr_destroy(void key, void datum, void *p)
		{
		struct mls_range *rt = datum;

		kfree(key);
		ebitmap_destroy(&rt->level[0].cat);
		ebitmap_destroy(&rt->level[1].cat);
		@@ -439,6 +441,7 @@ static int filenametr_cmp(struct hashtab h, const void k1, const void *k2)
		static u32 rangetr_hash(struct hashtab h, const void k)
		{
		const struct range_trans *key = k;

		return (key->source_type + (key->target_type << 3) +
		(key->target_class << 5)) & (h->size - 1);
		}
		@@ -488,7 +491,8 @@ static int policydb_init(struct policydb *p)
		if (rc)
		goto out;

		p->filename_trans = hashtab_create(filenametr_hash, filenametr_cmp, (1 << 10));
		p->filename_trans = hashtab_create(filenametr_hash, filenametr_cmp,
		(1 << 10));
		if (!p->filename_trans) {
		rc = -ENOMEM;
		goto out;
		@@ -664,9 +668,9 @@ static void hash_eval(struct hashtab h, const char hash_name)
		struct hashtab_info info;

		hashtab_stat(h, &info);
		pr_debug("SELinux: %s: %d entries and %d/%d buckets used, "
		"longest chain length %d\n", hash_name, h->nel,
		info.slots_used, h->size, info.max_chain_len);
		pr_debug("SELinux: %s: %d entries and %d/%d buckets used, longest chain length %d\n",
		hash_name, h->nel, info.slots_used, h->size,
		info.max_chain_len);
		}

		static void symtab_hash_eval(struct symtab *s)

Admin message