From: Eric W. Biederman <ebiederm@xmission.com>
Date: Wed, 14 Feb 2007 08:34:15 +0000 (-0800)
Subject: [PATCH] sysctl: fix the selinux_sysctl_get_sid
X-Git-Tag: v2.6.21-rc1~187
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b599fdfdb4bb4941e9076308efcf3bb89e577db5;p=linux-2.6-omap-h63xx.git

[PATCH] sysctl: fix the selinux_sysctl_get_sid

I goofed and when reenabling the fine grained selinux labels for
sysctls and forgot to add the "/sys" prefix before consulting
the policy database.  When computing the same path using
proc_dir_entries we got the "/sys" for free as it was part
of the tree, but it isn't true for clt_table trees.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 118ddfb614e..b8ede1c7607 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -1451,6 +1451,12 @@ static int selinux_sysctl_get_sid(ctl_table *table, u16 tclass, u32 *sid)
 		path = end;
 		table = table->parent;
 	}
+	buflen -= 4;
+	if (buflen < 0)
+		goto out_free;
+	end -= 4;
+	memcpy(end, "/sys", 4);
+	path = end;
 	rc = security_genfs_sid("proc", path, tclass, sid);
 out_free:
 	free_page((unsigned long)buffer);