Commit 89197da

iboukrisfrozencemetery

authored and

committed

Avoid NULL dereference of 'actual_mech_type'

The actual_mech is not promised till we complet the context. This fix a segfault when creating a SecurityContext with SPNEGO mech. [rharwood@redhat.com: Squash with fixup commit]

1 parent 102ea36 commit 89197daCopy full SHA for 89197da

File tree

1 file changed

-2

lines changed

gssapi/raw
- sec_contexts.pyx

1 file changed

-2

lines changed

`‎gssapi/raw/sec_contexts.pyx‎`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ flags=None, lifetime=None, channel_bindings=None, input_token=None)`
`204`	`204`	`input_token_buffer.value = input_token`
`205`	`205`	`input_token_buffer.length = len(input_token)`
`206`	`206`
`207`		`- cdef gss_OID actual_mech_type`
	`207`	`+ cdef gss_OID actual_mech_type= GSS_C_NO_OID`
`208`	`208`	`cdef gss_buffer_desc output_token_buffer = gss_buffer_desc(0, NULL)`
`209`	`209`	`cdef OM_uint32 ret_flags`
`210`	`210`	`cdef OM_uint32 output_ttl`
`@@ -232,7 +232,9 @@ flags=None, lifetime=None, channel_bindings=None, input_token=None)`
`232`	`232`
`233`	`233`	`cdef OID output_mech_type = OID()`
`234`	`234`	`if maj_stat == GSS_S_COMPLETE or maj_stat == GSS_S_CONTINUE_NEEDED:`
`235`		`- output_mech_type.raw_oid = actual_mech_type[0]`
	`235`	`+ if actual_mech_type is not GSS_C_NO_OID:`
	`236`	`+ output_mech_type.raw_oid = actual_mech_type[0]`
	`237`	`+`
`236`	`238`	`return InitSecContextResult(output_context, output_mech_type,`
`237`	`239`	`IntEnumFlagSet(RequirementFlag, ret_flags),`
`238`	`240`	`output_token,`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 89197da

File tree

1 file changed

1 file changed

`‎gssapi/raw/sec_contexts.pyx‎`

0 commit comments