2006-09-18 18:49:05

by Kylene Jo Hall

[permalink] [raw]
Subject: [PATCH] slim: socket_post_create hook return code

The socket_post_create LSM hook has gone from a void return to an int.
This patch properly updates the SLIM hook definition and return to
reflect this change.

Signed-off-by: Mimi Zohar <[email protected]>
Signed-of-by: Kylene Hall <[email protected]>
---
security/slim/slm_main.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)

Index: linux-2.6.18-rc6-mm2/security/slim/slm_main.c
===================================================================
--- linux-2.6.18-rc6-mm2.orig/security/slim/slm_main.c
+++ linux-2.6.18-rc6-mm2/security/slim/slm_main.c
@@ -1129,7 +1131,7 @@ int slm_socket_create(int family, int ty
/*
* Didn't have the family type previously, so update the inode security now.
*/
-static void slm_socket_post_create(struct socket *sock, int family,
+static int slm_socket_post_create(struct socket *sock, int family,
int type, int protocol, int kern)
{
struct slm_tsec_data *cur_tsec = current->security;
@@ -1145,6 +1147,7 @@ static void slm_socket_post_create(struc
} else
set_level_untrusted(&slm_isec->level);
spin_unlock(&slm_isec->lock);
+ return 0;
}

/*