[29264] in CVS-changelog-for-Kerberos-V5
krb5 commit [krb5-1.13]: Fix memory leak in SPNEGO
daemon@ATHENA.MIT.EDU (Tom Yu)
Fri Jan 15 17:10:31 2016
Date: Fri, 15 Jan 2016 17:10:26 -0500
From: Tom Yu <tlyu@mit.edu>
Message-Id: <201601152210.u0FMAQhS005921@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/fd0eb62f85e1f57d07aec72bec73a90f5032b60b
commit fd0eb62f85e1f57d07aec72bec73a90f5032b60b
Author: Greg Hudson <ghudson@mit.edu>
Date: Wed Nov 25 14:43:35 2015 -0500
Fix memory leak in SPNEGO gss_init_sec_context()
After the initial call to spnego_gss_init_sec_context(), the context
handle can leak if init_ctx_cont() returns an error, because the
cleanup handler assumes that spnego_ctx contains the value of
*context_handle. Fix this leak by setting spnego_ctx before the if
block which contains that call. Reported by Adam Bernstein.
(cherry picked from commit 159dbbd5ff14fdc2fa71fb3a8804eb401c914399)
ticket: 8281
version_fixed: 1.13.4
tags: -pullup
status: resolved
src/lib/gssapi/spnego/spnego_mech.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c
index ec38eea..ce157c5 100644
--- a/src/lib/gssapi/spnego/spnego_mech.c
+++ b/src/lib/gssapi/spnego/spnego_mech.c
@@ -1024,7 +1024,8 @@ spnego_gss_init_sec_context(
/* Step 1: perform mechanism negotiation. */
spcred = (spnego_gss_cred_id_t)claimant_cred_handle;
- if (*context_handle == GSS_C_NO_CONTEXT) {
+ spnego_ctx = (spnego_gss_ctx_id_t)*context_handle;
+ if (spnego_ctx == NULL) {
ret = init_ctx_new(minor_status, spcred,
context_handle, &send_token);
if (ret != GSS_S_CONTINUE_NEEDED) {
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
