The patch titled
slim: socket_post_create hook return code
has been removed from the -mm tree. Its filename was
slim-main-patch-socket_post_create-hook-return-code.patch
This patch was dropped because it was folded into slim-main-patch.patch
------------------------------------------------------
Subject: slim: socket_post_create hook return code
From: Kylene Jo Hall <kjhall@xxxxxxxxxx>
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 <zohar@xxxxxxxxxx>
Signed-of-by: Kylene Hall <kjhall@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
security/slim/slm_main.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)
diff -puN security/slim/slm_main.c~slim-main-patch-socket_post_create-hook-return-code security/slim/slm_main.c
--- a/security/slim/slm_main.c~slim-main-patch-socket_post_create-hook-return-code
+++ a/security/slim/slm_main.c
@@ -970,7 +970,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;
@@ -986,6 +986,7 @@ static void slm_socket_post_create(struc
} else
set_level_untrusted(&slm_isec->level);
spin_unlock(&slm_isec->lock);
+ return 0;
}
/*
_
Patches currently in -mm which might be from kjhall@xxxxxxxxxx are
mprotect-patch-for-use-by-slim.patch
integrity-service-api-and-dummy-provider.patch
slim-main-patch.patch
slim-main-patch-socket_post_create-hook-return-code.patch
slim-main-patch-misc-cleanups-requested-at-inclusion-time.patch
slim-main-patch-handle-failure-to-register.patch
slim-main-patch-fix-bug-with-mm_users-usage.patch
slim-main-patch-security-slim-slm_mainc-make-2-functions-static.patch
slim-main-include-fix.patch
slim-secfs-patch.patch
slim-secfs-patch-slim-correct-use-of-snprintf.patch
slim-secfs-patch-cleanup-use-of-configh.patch
slim-make-and-config-stuff.patch
slim-make-and-config-stuff-makefile-fix.patch
slim-debug-output.patch
slim-debug-output-slm_set_taskperm-remove-horrible-error-handling-code.patch
slim-fix-security-issue-with-the-task_post_setuid-hook.patch
slim-secfs-inode-i_private-build-fix.patch
slim-documentation.patch
panic-on-slim-selinux.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
