diff options
| author |   Xiu Jianfeng <xiujianfeng@huawei.com> | 2021-07-29 11:16:44 +0800 |
|---|---|---|
| committer |   Paul Moore <paul@paul-moore.com> | 2021-08-02 09:59:50 -0400 |
| commit | 4c156084daa8ee70978e4b150b5eb5fc7b1f15be (patch) | |
| tree | e7a0283d4a1857d1558e614f1bb9794a44e7c63f /security/selinux/ss/policydb.c | |
| parent | selinux: kill 'flags' argument in avc_has_perm_flags() and avc_audit() (diff) | |
| download | linux-dev-4c156084daa8ee70978e4b150b5eb5fc7b1f15be.tar.xz linux-dev-4c156084daa8ee70978e4b150b5eb5fc7b1f15be.zip | |
selinux: correct the return value when loads initial sids
It should not return 0 when SID 0 is assigned to isids.
This patch fixes it.
Cc: stable@vger.kernel.org
Fixes: e3e0b582c321a ("selinux: remove unused initial SIDs and improve handling")
Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
[PM: remove changelog from description]
Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'security/selinux/ss/policydb.c')
| -rw-r--r-- | security/selinux/ss/policydb.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index defc5ef35c66..0ae1b718194a 100644 --- a/security/selinux/ss/policydb.c +++ b/security/selinux/ss/policydb.c @@ -874,7 +874,7 @@ int policydb_load_isids(struct policydb *p, struct sidtab *s) rc = sidtab_init(s); if (rc) { pr_err("SELinux: out of memory on SID table init\n"); - goto out; + return rc; } head = p->ocontexts[OCON_ISID]; @@ -885,7 +885,7 @@ int policydb_load_isids(struct policydb *p, struct sidtab *s) if (sid == SECSID_NULL) { pr_err("SELinux: SID 0 was assigned a context.\n"); sidtab_destroy(s); - goto out; + return -EINVAL; } /* Ignore initial SIDs unused by this kernel. */ @@ -897,12 +897,10 @@ int policydb_load_isids(struct policydb *p, struct sidtab *s) pr_err("SELinux: unable to load initial SID %s.\n", name); sidtab_destroy(s); - goto out; + return rc; } } - rc = 0; -out: - return rc; + return 0; } int policydb_class_isvalid(struct policydb *p, unsigned int class) |