svn rev #22813: branches/krb5-1-7/src/lib/gssapi/spnego/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22813
Commit By: tlyu
Log Message:
ticket: 6551
version_fixed: 1.7.1
status: resolved

pull up r22636 from trunk
 ------------------------------------------------------------------------
 r22636 | ghudson | 2009-08-27 09:40:50 -0400 (Thu, 27 Aug 2009) | 17 lines

 ticket: 6551
 subject: Memory leak in spnego accept_sec_context error path
 tags: pullup
 target_version: 1.7

 If the underlying mechanism's accept_sec_context returns an error, the
 spnego accept_sec_context was leaving allocated data in
 *context_handle, which is incorrect for the first call according to
 RFC 2744.

 Fix this by mirroring some code from the spnego init_sec_context,
 which always cleans up the half-constructed context in case of error.
 This is allowed (though not encouraged) by RFC 2744 for second and
 subsequent calls; since we were already doing it in init_sec_context,
 it seems simpler to do that than keep track of whether this is a first
 call or not.


Changed Files:
U   branches/krb5-1-7/src/lib/gssapi/spnego/spnego_mech.c
Modified: branches/krb5-1-7/src/lib/gssapi/spnego/spnego_mech.c
===================================================================
--- branches/krb5-1-7/src/lib/gssapi/spnego/spnego_mech.c	2009-09-29 01:39:02 UTC (rev 22812)
+++ branches/krb5-1-7/src/lib/gssapi/spnego/spnego_mech.c	2009-09-29 01:39:08 UTC (rev 22813)
@@ -1681,6 +1681,13 @@
 			*src_name = sc->internal_name;
 		}
 		release_spnego_ctx(&sc);
+	} else if (ret != GSS_S_CONTINUE_NEEDED) {
+		if (sc != NULL) {
+			gss_delete_sec_context(&tmpmin, &sc->ctx_handle,
+					       GSS_C_NO_BUFFER);
+			release_spnego_ctx(&sc);
+		}
+		*context_handle = GSS_C_NO_CONTEXT;
 	}
 	gss_release_buffer(&tmpmin, &mechtok_out);
 	if (mechtok_in != GSS_C_NO_BUFFER) {