luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SELinux: Write class field in role_trans_write.

Browse Source 
If kernel policy version is >= 26, then write the class field of the
role_trans structure into the binary reprensentation.

Signed-off-by: Harry Ciao <qingtao.cao@windriver.com>
Acked-by:  Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: Eric Paris <eparis@redhat.com>
This commit is contained in:
Harry Ciao 2011-03-25 13:52:00 +08:00 committed by Eric Paris
parent 63a312ca55
commit c900ff323d
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2535,8 +2535,9 @@ static int cat_write(void *vkey, void *datum, void *ptr)
return 0; return 0;
} }
static int role_trans_write(struct role_trans *r, void *fp) static int role_trans_write(struct policydb *p, void *fp)
{ {
struct role_trans *r = p->role_tr;
struct role_trans *tr; struct role_trans *tr;
u32 buf[3]; u32 buf[3];
size_t nel; size_t nel;
@ -2556,6 +2557,12 @@ static int role_trans_write(struct role_trans *r, void *fp)
rc = put_entry(buf, sizeof(u32), 3, fp); rc = put_entry(buf, sizeof(u32), 3, fp);
if (rc) if (rc)
return rc; return rc;
if (p->policyvers >= POLICYDB_VERSION_ROLETRANS) {
buf[0] = cpu_to_le32(tr->tclass);
rc = put_entry(buf, sizeof(u32), 1, fp);
if (rc)
return rc;
}
} }
return 0; return 0;
@ -3267,7 +3274,7 @@ int policydb_write(struct policydb *p, void *fp)
if (rc) if (rc)
return rc; return rc;
rc = role_trans_write(p->role_tr, fp); rc = role_trans_write(p, fp);
if (rc) if (rc)
return rc; return rc;