From 4b82916570a9097ac3e75d859fcaadb34e04e6d4 Mon Sep 17 00:00:00 2001 From: cem Date: Tue, 26 Apr 2016 18:11:45 +0000 Subject: [PATCH] HBSD MFC: kgssapi: Don't leak memory in error cases Reported by: Coverity CIDs: 1007046, 1007047, 1007048 Sponsored by: EMC / Isilon Storage Division (cherry picked from commit 933a29ecef32ffe369e04f46c211661b7c9c6d87) Signed-off-by: Oliver Pinter --- sys/kgssapi/gssd_prot.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/kgssapi/gssd_prot.c b/sys/kgssapi/gssd_prot.c index 3b8fbc591dc8..f888baf6e622 100644 --- a/sys/kgssapi/gssd_prot.c +++ b/sys/kgssapi/gssd_prot.c @@ -101,8 +101,10 @@ xdr_gss_OID(XDR *xdrs, gss_OID *oidp) } else { oid = mem_alloc(sizeof(gss_OID_desc)); memset(oid, 0, sizeof(*oid)); - if (!xdr_gss_OID_desc(xdrs, oid)) + if (!xdr_gss_OID_desc(xdrs, oid)) { + mem_free(oid, sizeof(gss_OID_desc)); return (FALSE); + } *oidp = oid; } break; @@ -164,8 +166,10 @@ xdr_gss_OID_set(XDR *xdrs, gss_OID_set *setp) } else { set = mem_alloc(sizeof(gss_OID_set_desc)); memset(set, 0, sizeof(*set)); - if (!xdr_gss_OID_set_desc(xdrs, set)) + if (!xdr_gss_OID_set_desc(xdrs, set)) { + mem_free(set, sizeof(gss_OID_set_desc)); return (FALSE); + } *setp = set; } break; @@ -224,8 +228,10 @@ xdr_gss_channel_bindings_t(XDR *xdrs, gss_channel_bindings_t *chp) || !xdr_gss_buffer_desc(xdrs, &ch->acceptor_address) || !xdr_gss_buffer_desc(xdrs, - &ch->application_data)) + &ch->application_data)) { + mem_free(ch, sizeof(*ch)); return (FALSE); + } *chp = ch; } break;