openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

selinux: don't produce incorrect filename_trans_count 

I thought I fixed the counting in filename_trans_read_helper() to count
the compat rule count correctly in the final version, but it's still
wrong. To really count the same thing as in the compat path, we'd need
to add up the cardinalities of stype bitmaps of all datums.

Since the kernel currently doesn't implement an ebitmap_cardinality()
function (and computing the proper count would just waste CPU cycles
anyway), just document that we use the field only in case of the old
format and stop updating it in filename_trans_read_helper().

Fixes: 4300590243 ("selinux: implement new format of filename transitions")
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-20 15:27:31 +02:00 committed by Paul Moore
parent 4300590243
commit 9521eb3ea1
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2016,12 +2016,7 @@ static int filename_trans_read_helper(struct policydb *p, void *fp)
if (rc) if (rc)
goto out; goto out;
rc = ebitmap_set_bit(&p->filename_trans_ttypes, ttype, 1); return ebitmap_set_bit(&p->filename_trans_ttypes, ttype, 1);
if (rc)
return rc;
p->filename_trans_count += ndatum;
return 0;
out: out:
kfree(ft); kfree(ft);
@ -2051,7 +2046,7 @@ static int filename_trans_read(struct policydb *p, void *fp)
nel = le32_to_cpu(buf[0]); nel = le32_to_cpu(buf[0]);
if (p->policyvers < POLICYDB_VERSION_COMP_FTRANS) { if (p->policyvers < POLICYDB_VERSION_COMP_FTRANS) {
p->filename_trans_count = nel; p->compat_filename_trans_count = nel;
p->filename_trans = hashtab_create(filenametr_hash, p->filename_trans = hashtab_create(filenametr_hash,
filenametr_cmp, (1 << 11)); filenametr_cmp, (1 << 11));
if (!p->filename_trans) if (!p->filename_trans)
@ -3568,7 +3563,7 @@ static int filename_trans_write(struct policydb *p, void *fp)
return 0; return 0;
if (p->policyvers < POLICYDB_VERSION_COMP_FTRANS) { if (p->policyvers < POLICYDB_VERSION_COMP_FTRANS) {
buf[0] = cpu_to_le32(p->filename_trans_count); buf[0] = cpu_to_le32(p->compat_filename_trans_count);
rc = put_entry(buf, sizeof(u32), 1, fp); rc = put_entry(buf, sizeof(u32), 1, fp);
if (rc) if (rc)
return rc; return rc;

3
security/selinux/ss/policydb.h
View File

@ -270,7 +270,8 @@ struct policydb {
struct ebitmap filename_trans_ttypes; struct ebitmap filename_trans_ttypes;
/* actual set of filename_trans rules */ /* actual set of filename_trans rules */
struct hashtab *filename_trans; struct hashtab *filename_trans;
u32 filename_trans_count; /* only used if policyvers < POLICYDB_VERSION_COMP_FTRANS */
u32 compat_filename_trans_count;
/* bools indexed by (value - 1) */ /* bools indexed by (value - 1) */
struct cond_bool_datum **bool_val_to_struct; struct cond_bool_datum **bool_val_to_struct;