diff options
| author | James Morris <jmorris@namei.org> | 2008-10-11 09:26:14 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-10-11 09:26:14 +1100 |
| commit | 0da939b0058742ad2d8580b7db6b966d0fc72252 (patch) | |
| tree | 47cb109fdf97135191bff5db4e3bfc905136bf8b /security/selinux/ss | |
| parent | 4bdec11f560b8f405a011288a50e65b1a81b3654 (diff) | |
| parent | d91d40799165b0c84c97e7c71fb8039494ff07dc (diff) | |
| download | linux-0da939b0058742ad2d8580b7db6b966d0fc72252.tar.gz linux-0da939b0058742ad2d8580b7db6b966d0fc72252.tar.bz2 linux-0da939b0058742ad2d8580b7db6b966d0fc72252.zip | |
Merge branch 'master' of git://git.infradead.org/users/pcmoore/lblnet-2.6_next into next
Diffstat (limited to 'security/selinux/ss')
| -rw-r--r-- | security/selinux/ss/services.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index ab0cc0c7b944..343c8ab14af0 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c @@ -2955,7 +2955,7 @@ netlbl_secattr_to_sid_return_cleanup: */ int security_netlbl_sid_to_secattr(u32 sid, struct netlbl_lsm_secattr *secattr) { - int rc = -ENOENT; + int rc; struct context *ctx; if (!ss_initialized) @@ -2963,11 +2963,18 @@ int security_netlbl_sid_to_secattr(u32 sid, struct netlbl_lsm_secattr *secattr) read_lock(&policy_rwlock); ctx = sidtab_search(&sidtab, sid); - if (ctx == NULL) + if (ctx == NULL) { + rc = -ENOENT; goto netlbl_sid_to_secattr_failure; + } secattr->domain = kstrdup(policydb.p_type_val_to_name[ctx->type - 1], GFP_ATOMIC); - secattr->flags |= NETLBL_SECATTR_DOMAIN_CPY; + if (secattr->domain == NULL) { + rc = -ENOMEM; + goto netlbl_sid_to_secattr_failure; + } + secattr->attr.secid = sid; + secattr->flags |= NETLBL_SECATTR_DOMAIN_CPY | NETLBL_SECATTR_SECID; mls_export_netlbl_lvl(ctx, secattr); rc = mls_export_netlbl_cat(ctx, secattr); if (rc != 0) |