The patch titled slim: socket_post_create hook return code has been added to the -mm tree. Its filename is slim-main-patch-socket_post_create-hook-return-code.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ 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-secfs-patch.patch slim-make-and-config-stuff.patch slim-debug-output.patch slim-fix-security-issue-with-the-task_post_setuid-hook.patch slim-documentation.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