AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

selinux: simplify range_write()

Browse Source 
No need to traverse the hashtab to count its elements, hashtab already
tracks it for us.

Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
This commit is contained in:
Ondrej Mosnacek 2020-04-28 14:55:11 +02:00 committed by Paul Moore
parent 4c09f8b691
commit 3348bd33e8
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
security/selinux/ss/policydb.c
View File

@ -3405,14 +3405,6 @@ static int genfs_write(struct policydb *p, void *fp)
return 0; return 0;
} }
static int hashtab_cnt(void *key, void *data, void *ptr)
{
int *cnt = ptr;
*cnt = *cnt + 1;
return 0;
}
static int range_write_helper(void *key, void *data, void *ptr) static int range_write_helper(void *key, void *data, void *ptr)
{ {
__le32 buf[2]; __le32 buf[2];
@ -3444,19 +3436,13 @@ static int range_write_helper(void *key, void *data, void *ptr)
static int range_write(struct policydb *p, void *fp) static int range_write(struct policydb *p, void *fp)
{ {
__le32 buf[1]; __le32 buf[1];
int rc, nel; int rc;
struct policy_data pd; struct policy_data pd;
pd.p = p; pd.p = p;
pd.fp = fp; pd.fp = fp;
/* count the number of entries in the hashtab */ buf[0] = cpu_to_le32(p->range_tr->nel);
nel = 0;
rc = hashtab_map(p->range_tr, hashtab_cnt, &nel);
if (rc)
return rc;
buf[0] = cpu_to_le32(nel);
rc = put_entry(buf, sizeof(u32), 1, fp); rc = put_entry(buf, sizeof(u32), 1, fp);
if (rc) if (rc)
return rc; return rc;