From b90b586e4f5693ae03cd62219e6ec53d5943414c Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Tue, 15 Jan 2008 23:47:35 +0000
Subject: [PATCH] --- yaml --- r: 76095 b: refs/heads/master c:
 63cb34492351078479b2d4bae6a881806a396286 h: refs/heads/master i:   76093:
 4b5bcab90fb49c9a9f960fe54e48a8e9d96b00ab   76091:
 a999c78e3241c195fde515e76633f3850bad0802   76087:
 42daf756140ff1399b42ea9e419baaa49e5452d7   76079:
 7879daebe120948b96b4e02043e5b1e24615e9d6   76063:
 cc6e7266be82a644ce67b98fb09f0ffb0d8e5e1e   76031:
 8e743068df89ff7b7f34775455f505ede31300d5 v: v3

---
 [refs]                         |  2 +-
 trunk/include/linux/security.h | 13 +++++++++++++
 trunk/security/dummy.c         |  6 ++++++
 trunk/security/security.c      |  6 ++++++
 trunk/security/selinux/hooks.c |  6 ++++++
 5 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 12956a819e56..dc6c9342f4f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c43e259cc756ece387faae849af0058b56d78466
+refs/heads/master: 63cb34492351078479b2d4bae6a881806a396286
diff --git a/trunk/include/linux/security.h b/trunk/include/linux/security.h
index 2e2c63faead7..e4a91cb1b187 100644
--- a/trunk/include/linux/security.h
+++ b/trunk/include/linux/security.h
@@ -1202,6 +1202,10 @@ struct request_sock;
  *	Convert secid to security context.
  *	@secid contains the security ID.
  *	@secdata contains the pointer that stores the converted security context.
+ * @secctx_to_secid:
+ *      Convert security context to secid.
+ *      @secid contains the pointer to the generated security ID.
+ *      @secdata contains the security context.
  *
  * @release_secctx:
  *	Release the security context.
@@ -1396,6 +1400,7 @@ struct security_operations {
  	int (*getprocattr)(struct task_struct *p, char *name, char **value);
  	int (*setprocattr)(struct task_struct *p, char *name, void *value, size_t size);
 	int (*secid_to_secctx)(u32 secid, char **secdata, u32 *seclen);
+	int (*secctx_to_secid)(char *secdata, u32 seclen, u32 *secid);
 	void (*release_secctx)(char *secdata, u32 seclen);
 
 #ifdef CONFIG_SECURITY_NETWORK
@@ -1634,6 +1639,7 @@ int security_setprocattr(struct task_struct *p, char *name, void *value, size_t
 int security_netlink_send(struct sock *sk, struct sk_buff *skb);
 int security_netlink_recv(struct sk_buff *skb, int cap);
 int security_secid_to_secctx(u32 secid, char **secdata, u32 *seclen);
+int security_secctx_to_secid(char *secdata, u32 seclen, u32 *secid);
 void security_release_secctx(char *secdata, u32 seclen);
 
 #else /* CONFIG_SECURITY */
@@ -2308,6 +2314,13 @@ static inline int security_secid_to_secctx(u32 secid, char **secdata, u32 *secle
 	return -EOPNOTSUPP;
 }
 
+static inline int security_secctx_to_secid(char *secdata,
+					   u32 seclen,
+					   u32 *secid)
+{
+	return -EOPNOTSUPP;
+}
+
 static inline void security_release_secctx(char *secdata, u32 seclen)
 {
 }
diff --git a/trunk/security/dummy.c b/trunk/security/dummy.c
index 8e34e03415f8..48d4b0a52737 100644
--- a/trunk/security/dummy.c
+++ b/trunk/security/dummy.c
@@ -946,6 +946,11 @@ static int dummy_secid_to_secctx(u32 secid, char **secdata, u32 *seclen)
 	return -EOPNOTSUPP;
 }
 
+static int dummy_secctx_to_secid(char *secdata, u32 seclen, u32 *secid)
+{
+	return -EOPNOTSUPP;
+}
+
 static void dummy_release_secctx(char *secdata, u32 seclen)
 {
 }
@@ -1106,6 +1111,7 @@ void security_fixup_ops (struct security_operations *ops)
  	set_to_dummy_if_null(ops, getprocattr);
  	set_to_dummy_if_null(ops, setprocattr);
  	set_to_dummy_if_null(ops, secid_to_secctx);
+	set_to_dummy_if_null(ops, secctx_to_secid);
  	set_to_dummy_if_null(ops, release_secctx);
 #ifdef CONFIG_SECURITY_NETWORK
 	set_to_dummy_if_null(ops, unix_stream_connect);
diff --git a/trunk/security/security.c b/trunk/security/security.c
index 5068808343d0..ca475ca206e4 100644
--- a/trunk/security/security.c
+++ b/trunk/security/security.c
@@ -831,6 +831,12 @@ int security_secid_to_secctx(u32 secid, char **secdata, u32 *seclen)
 }
 EXPORT_SYMBOL(security_secid_to_secctx);
 
+int security_secctx_to_secid(char *secdata, u32 seclen, u32 *secid)
+{
+	return security_ops->secctx_to_secid(secdata, seclen, secid);
+}
+EXPORT_SYMBOL(security_secctx_to_secid);
+
 void security_release_secctx(char *secdata, u32 seclen)
 {
 	return security_ops->release_secctx(secdata, seclen);
diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c
index 233c8b97462f..0396354fff95 100644
--- a/trunk/security/selinux/hooks.c
+++ b/trunk/security/selinux/hooks.c
@@ -4947,6 +4947,11 @@ static int selinux_secid_to_secctx(u32 secid, char **secdata, u32 *seclen)
 	return security_sid_to_context(secid, secdata, seclen);
 }
 
+static int selinux_secctx_to_secid(char *secdata, u32 seclen, u32 *secid)
+{
+	return security_context_to_sid(secdata, seclen, secid);
+}
+
 static void selinux_release_secctx(char *secdata, u32 seclen)
 {
 	kfree(secdata);
@@ -5138,6 +5143,7 @@ static struct security_operations selinux_ops = {
 	.setprocattr =                  selinux_setprocattr,
 
 	.secid_to_secctx =		selinux_secid_to_secctx,
+	.secctx_to_secid =		selinux_secctx_to_secid,
 	.release_secctx =		selinux_release_secctx,
 
         .unix_stream_connect =		selinux_socket_unix_stream_connect,