aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2015-06-10 19:48:51 -0400
committerTom Yu <tlyu@mit.edu>2015-12-09 14:53:54 -0500
commitfab95cde1f691ce6becc69bf013e2883d2213c03 (patch)
tree2a5e5887b4525ad09a5f596ad36864e966021753
parentab1304e120112bf73cbd867410b08a2bcff6beb8 (diff)
downloadkrb5-fab95cde1f691ce6becc69bf013e2883d2213c03.zip
krb5-fab95cde1f691ce6becc69bf013e2883d2213c03.tar.gz
krb5-fab95cde1f691ce6becc69bf013e2883d2213c03.tar.bz2
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
-rw-r--r--src/lib/gssapi/mechglue/g_initialize.c2
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 68aa7a7..97048f3 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();