krb5 commit: Tolerate null oid pointer in gss_release_oid()

Greg Hudson ghudson at mit.edu
Thu Jun 11 12:12:05 EDT 2015


https://github.com/krb5/krb5/commit/4676e823e6ee9a5731872b31c5588c1b5932e0a3
commit 4676e823e6ee9a5731872b31c5588c1b5932e0a3
Author: Greg Hudson <ghudson at mit.edu>
Date:   Wed Jun 10 19:48:51 2015 -0400

    Tolerate null oid pointer in gss_release_oid()
    
    Under some circumstances, gss_inquire_name() can call
    gss_release_oid() with a null oid pointer, which currently causes a
    null dereference.  The least invasive fix is for gss_release_oid() to
    check for the invalid null pointer and return an error, like other
    GSS-API functions do.
    
    ticket: 8201 (new)
    target_version: 1.13.3
    tags: pullup

 src/lib/gssapi/mechglue/g_initialize.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/lib/gssapi/mechglue/g_initialize.c b/src/lib/gssapi/mechglue/g_initialize.c
index 2987164..b7e8a8d 100644
--- a/src/lib/gssapi/mechglue/g_initialize.c
+++ b/src/lib/gssapi/mechglue/g_initialize.c
@@ -168,7 +168,7 @@ gss_OID *oid;
 	OM_uint32 major;
 	gss_mech_info aMech;
 
-	if (minor_status == NULL)
+	if (minor_status == NULL || oid == NULL)
 		return (GSS_S_CALL_INACCESSIBLE_WRITE);
 
 	*minor_status = gssint_mechglue_initialize_library();


More information about the cvs-krb5 mailing list