oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

gsskrb5: Fix uninit var in acceptor

Browse Source
This commit is contained in:
Nicolas Williams
2023-01-02 20:36:26 -06:00
parent 67c35bc1ca
commit 882f9fddaa
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/gssapi/mech/gss_accept_sec_context.c
View File

@@ -172,7 +172,7 @@ choose_mech(struct _gss_context *ctx)
if (len == 0) { if (len == 0) {
/* /*
* There is the a wierd mode of SPNEGO (in CIFS and * There is the a wierd mode of SPNEGO (in CIFS and
* SASL GSS-SPENGO where the first token is zero * SASL GSS-SPENGO) where the first token is zero
* length and the acceptor returns a mech_list, lets * length and the acceptor returns a mech_list, lets
* hope that is what is happening now. * hope that is what is happening now.
* *
@@ -190,13 +190,17 @@ choose_mech(struct _gss_context *ctx)
* Decode the OID for the mechanism. Simplify life by * Decode the OID for the mechanism. Simplify life by
* assuming that the OID length is less than 128 bytes. * assuming that the OID length is less than 128 bytes.
*/ */
if (len < 2 || *p != 0x06) if (len < 2 || *p != 0x06) {
goto bail; _gss_mg_log(10, "initial context token appears to be for non-standard mechanism");
if ((p[1] & 0x80) || p[1] > (len - 2)) return GSS_S_COMPLETE;
goto bail; }
len -= 2;
if ((p[1] & 0x80) || p[1] > len) {
_gss_mg_log(10, "mechanism oid in initial context token is too long");
return GSS_S_COMPLETE;
}
mech.length = p[1]; mech.length = p[1];
p += 2; p += 2;
len -= 2;
mech.elements = p; mech.elements = p;
mech_oid = _gss_mg_support_mechanism(&mech); mech_oid = _gss_mg_support_mechanism(&mech);
@@ -209,19 +213,13 @@ gss_get_mechanism:
* and we have to try all mechs (that we have a cred element * and we have to try all mechs (that we have a cred element
* for, if we have a cred). * for, if we have a cred).
*/ */
if (mech_oid != GSS_C_NO_OID) { log_oid("mech oid", mech_oid);
log_oid("mech oid", mech_oid); ctx->gc_mech = __gss_get_mechanism(mech_oid);
ctx->gc_mech = __gss_get_mechanism(mech_oid); if (!ctx->gc_mech) {
if (!ctx->gc_mech) { _gss_mg_log(10, "mechanism client used is unknown");
_gss_mg_log(10, "mechanism client used is unknown"); return (GSS_S_BAD_MECH);
return (GSS_S_BAD_MECH);
}
_gss_mg_log(10, "using mech \"%s\"", ctx->gc_mech->gm_name);
return GSS_S_COMPLETE;
} }
_gss_mg_log(10, "using mech \"%s\"", ctx->gc_mech->gm_name);
bail:
_gss_mg_log(10, "no mech oid found");
return GSS_S_COMPLETE; return GSS_S_COMPLETE;
} }