netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paul Moore <paul.moore@hp.com>
To: selinux@tycho.nsa.gov, linux-security-module@vger.kernel.org,
	netdev@vger.kernel.org
Subject: [RFC PATCH v1 1/6] selinux: Fix a problem in security_netlbl_sid_to_secattr()
Date: Fri, 08 Aug 2008 16:52:54 -0400	[thread overview]
Message-ID: <20080808205254.21077.91894.stgit@flek> (raw)
In-Reply-To: <20080808203542.21077.37084.stgit@flek>

Currently when SELinux fails to allocate memory in
security_netlbl_sid_to_secattr() the NetLabel LSM domain field is set to
NULL which triggers the default NetLabel LSM domain mapping which may not
always be the desired mapping.  This patch fixes this by returning an error
when the kernel is unable to allocate memory.  This could result in more
failures on a system with heavy memory pressure but it is the "correct"
thing to do.

Signed-off-by: XXX
---

 security/selinux/ss/services.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index b52f923..5b7ecc1 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -2788,7 +2788,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)
@@ -2796,10 +2796,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);


  reply	other threads:[~2008-08-08 20:52 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-08 20:52 [RFC PATCH v1 0/6] Labeled networking patches for 2.6.28 Paul Moore
2008-08-08 20:52 ` Paul Moore [this message]
2008-08-08 20:53 ` [RFC PATCH v1 2/6] netlabel: Replace protocol/NetLabel linking with refrerence counts Paul Moore
2008-08-08 22:37   ` Paul E. McKenney
2008-08-09  2:11     ` Paul Moore
2008-08-09 13:23       ` Paul E. McKenney
2008-08-09 14:40         ` Paul Moore
2008-08-08 20:53 ` [RFC PATCH v1 3/6] netlabel: Add a generic way to create ordered linked lists of network addrs Paul Moore
2008-08-08 20:53 ` [RFC PATCH v1 4/6] netlabel: Add network address selectors to the NetLabel/LSM domain mapping Paul Moore
2008-08-08 20:53 ` [RFC PATCH v1 5/6] netlabel: Add functionality to set the security attributes of a packet Paul Moore
2008-08-08 20:53 ` [RFC PATCH v1 6/6] selinux: Set socket NetLabel based on connection endpoint Paul Moore
2008-08-08 23:09 ` [RFC PATCH v1 0/6] Labeled networking patches for 2.6.28 David Miller
2008-08-09  2:18   ` Paul Moore

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080808205254.21077.91894.stgit@flek \
    --to=paul.moore@hp.com \
    --cc=linux-security-module@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=selinux@tycho.nsa.gov \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).