Memory leak in spnego accept_sec_context error path

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.

ticket: 6551
tags: pullup
target_version: 1.7

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22636 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c
index ae9ffa761c855a99287c37793ff59fb5a039a117..a2b926dc39051abc6d844a58f4aba9c21a755326 100644 (file)
--- a/src/lib/gssapi/spnego/spnego_mech.c
+++ b/src/lib/gssapi/spnego/spnego_mech.c
@@ -1681,6 +1681,13 @@ cleanup:
                        *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) {