From b0ff07286724c3d049b03fe3fff6fc57d2973c9e Mon Sep 17 00:00:00 2001 From: Harry Ciao Date: Thu, 7 Apr 2011 14:12:57 +0800 Subject: [PATCH] --- yaml --- r: 250787 b: refs/heads/master c: 1214eac73f798bccabc6adb55e7b2d787527c13c h: refs/heads/master i: 250785: 4cbcf07d9edf9cf345935e593e6248cb80b8f94d 250783: 06f1916c9fb67a54efabca398e732095b048ceb2 v: v3 --- [refs] | 2 +- trunk/security/selinux/ss/policydb.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 3c9be12c20bf..001bea5edb42 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eba71de2cb7c02c5ae4f2ad3656343da71bc4661 +refs/heads/master: 1214eac73f798bccabc6adb55e7b2d787527c13c diff --git a/trunk/security/selinux/ss/policydb.c b/trunk/security/selinux/ss/policydb.c index a493eae24e0a..82373eb2dc97 100644 --- a/trunk/security/selinux/ss/policydb.c +++ b/trunk/security/selinux/ss/policydb.c @@ -2275,6 +2275,11 @@ int policydb_read(struct policydb *p, void *fp) p->symtab[i].nprim = nprim; } + rc = -EINVAL; + p->process_class = string_to_security_class(p, "process"); + if (!p->process_class) + goto bad; + rc = avtab_read(&p->te_avtab, fp, p); if (rc) goto bad; @@ -2358,11 +2363,6 @@ int policydb_read(struct policydb *p, void *fp) if (rc) goto bad; - rc = -EINVAL; - p->process_class = string_to_security_class(p, "process"); - if (!p->process_class) - goto bad; - rc = -EINVAL; p->process_trans_perms = string_to_av_perm(p, p->process_class, "transition"); p->process_trans_perms |= string_to_av_perm(p, p->process_class, "dyntransition");