Attachment 11445 Details for Bug 11502 – patch for 4.2

[patch] patch for 4.2

42.patch (text/plain), 3.16 KB, created by Andreas Schneider on 2015-09-17 14:02:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2015-09-17 14:02:10 UTC

Size: 3.16 KB

patch

obsolete

>From 9f6dd1a3095b4dcd302cde726b0c4ed36bae51c4 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 8 Sep 2015 16:48:08 +0200
>Subject: [PATCH] pam_winbind: Fix a segfault if initialization fails
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11502
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>Reviewed-by: Michael Adam <obnox@samba.org>
>
>Autobuild-User(master): Michael Adam <obnox@samba.org>
>Autobuild-Date(master): Tue Sep  8 21:39:21 CEST 2015 on sn-devel-104
>
>(cherry picked from commit 7d84cd6e40024fd361ea21635f7befed40f0e41f)
>---
> nsswitch/pam_winbind.c | 19 ++++++++-----------
> 1 file changed, 8 insertions(+), 11 deletions(-)
>
>diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
>index 1a21a83..7b84a39 100644
>--- a/nsswitch/pam_winbind.c
>+++ b/nsswitch/pam_winbind.c
>@@ -2485,7 +2485,7 @@ static int _pam_delete_cred(pam_handle_t *pamh, int flags,
> 
> 	retval = _pam_winbind_init_context(pamh, flags, argc, argv, type, &ctx);
> 	if (retval) {
>-		goto out;
>+		return retval;
> 	}
> 
> 	_PAM_LOG_FUNCTION_ENTER("_pam_delete_cred", ctx);
>@@ -2621,7 +2621,7 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags,
> 	retval = _pam_winbind_init_context(pamh, flags, argc, argv,
> 					   PAM_WINBIND_AUTHENTICATE, &ctx);
> 	if (retval) {
>-		goto out;
>+		return retval;
> 	}
> 
> 	_PAM_LOG_FUNCTION_ENTER("pam_sm_authenticate", ctx);
>@@ -2773,7 +2773,7 @@ int pam_sm_setcred(pam_handle_t *pamh, int flags,
> 	ret = _pam_winbind_init_context(pamh, flags, argc, argv,
> 					PAM_WINBIND_SETCRED, &ctx);
> 	if (ret) {
>-		goto out;
>+		return ret;
> 	}
> 
> 	_PAM_LOG_FUNCTION_ENTER("pam_sm_setcred", ctx);
>@@ -2804,8 +2804,6 @@ int pam_sm_setcred(pam_handle_t *pamh, int flags,
> 			break;
> 	}
> 
>- out:
>-
> 	_PAM_LOG_FUNCTION_LEAVE("pam_sm_setcred", ctx, ret);
> 
> 	TALLOC_FREE(ctx);
>@@ -2829,7 +2827,7 @@ int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags,
> 	ret = _pam_winbind_init_context(pamh, flags, argc, argv,
> 					PAM_WINBIND_ACCT_MGMT, &ctx);
> 	if (ret) {
>-		goto out;
>+		return ret;
> 	}
> 
> 	_PAM_LOG_FUNCTION_ENTER("pam_sm_acct_mgmt", ctx);
>@@ -2925,7 +2923,7 @@ int pam_sm_open_session(pam_handle_t *pamh, int flags,
> 	ret = _pam_winbind_init_context(pamh, flags, argc, argv,
> 					PAM_WINBIND_OPEN_SESSION, &ctx);
> 	if (ret) {
>-		goto out;
>+		return ret;
> 	}
> 
> 	_PAM_LOG_FUNCTION_ENTER("pam_sm_open_session", ctx);
>@@ -2934,7 +2932,7 @@ int pam_sm_open_session(pam_handle_t *pamh, int flags,
> 		/* check and create homedir */
> 		ret = _pam_mkhomedir(ctx);
> 	}
>- out:
>+
> 	_PAM_LOG_FUNCTION_LEAVE("pam_sm_open_session", ctx, ret);
> 
> 	TALLOC_FREE(ctx);
>@@ -2952,12 +2950,11 @@ int pam_sm_close_session(pam_handle_t *pamh, int flags,
> 	ret = _pam_winbind_init_context(pamh, flags, argc, argv,
> 					PAM_WINBIND_CLOSE_SESSION, &ctx);
> 	if (ret) {
>-		goto out;
>+		return ret;
> 	}
> 
> 	_PAM_LOG_FUNCTION_ENTER("pam_sm_close_session", ctx);
> 
>-out:
> 	_PAM_LOG_FUNCTION_LEAVE("pam_sm_close_session", ctx, ret);
> 
> 	TALLOC_FREE(ctx);
>@@ -3039,7 +3036,7 @@ int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
> 	ret = _pam_winbind_init_context(pamh, flags, argc, argv,
> 					PAM_WINBIND_CHAUTHTOK, &ctx);
> 	if (ret) {
>-		goto out;
>+		return ret;
> 	}
> 
> 	_PAM_LOG_FUNCTION_ENTER("pam_sm_chauthtok", ctx);
>-- 
>2.5.2
>

Flags:

obnox: review+

Actions: View

Attachments on bug 11502: 11445 | 11446