From: Greg Hudson <ghudson@mit.edu>
Date: Wed, 10 Jun 2015 23:48:51 +0000 (-0400)
Subject: Tolerate null oid pointer in gss_release_oid()
X-Git-Tag: krb5-1.12.5-final~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fab95cde1f691ce6becc69bf013e2883d2213c03;p=thirdparty%2Fkrb5.git

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.

(cherry picked from commit 4676e823e6ee9a5731872b31c5588c1b5932e0a3)

ticket: 8303 (new)
version_fixed: 1.12.5
status: resolved
---

diff --git a/src/lib/gssapi/mechglue/g_initialize.c b/src/lib/gssapi/mechglue/g_initialize.c
index 68aa7a7aa9..97048f3f8e 100644
--- a/src/lib/gssapi/mechglue/g_initialize.c
+++ b/src/lib/gssapi/mechglue/g_initialize.c
@@ -164,7 +164,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();