From d445deb5e9fccbff6dd3bd169a2edfb10e6e078c Mon Sep 17 00:00:00 2001 From: Paul Moore Date: Fri, 10 Oct 2008 10:16:30 -0400 Subject: [PATCH] --- yaml --- r: 113653 b: refs/heads/master c: 99d854d231ce141850b988bdc7e2e7c78f49b03a h: refs/heads/master i: 113651: 000929c39ce46d998d7e6a8cbb8ff87c92a027d4 v: v3 --- [refs] | 2 +- trunk/security/selinux/ss/services.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 639ddde9b7d6..04f250f6116c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d8395c876bb8a560c8a032887e191b95499a25d6 +refs/heads/master: 99d854d231ce141850b988bdc7e2e7c78f49b03a diff --git a/trunk/security/selinux/ss/services.c b/trunk/security/selinux/ss/services.c index 8551952ef329..c8f688a10041 100644 --- a/trunk/security/selinux/ss/services.c +++ b/trunk/security/selinux/ss/services.c @@ -2785,7 +2785,7 @@ int security_netlbl_secattr_to_sid(struct netlbl_lsm_secattr *secattr, */ int security_netlbl_sid_to_secattr(u32 sid, struct netlbl_lsm_secattr *secattr) { - int rc = -ENOENT; + int rc; struct context *ctx; if (!ss_initialized) @@ -2793,10 +2793,16 @@ 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); + if (secattr->domain == NULL) { + rc = -ENOMEM; + goto netlbl_sid_to_secattr_failure; + } secattr->flags |= NETLBL_SECATTR_DOMAIN_CPY; mls_export_netlbl_lvl(ctx, secattr); rc = mls_export_netlbl_cat(ctx, secattr);