From owner-svn-src-head@freebsd.org Tue Apr 26 19:06:30 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5B384B1CFB6; Tue, 26 Apr 2016 19:06:30 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-ob0-x230.google.com (mail-ob0-x230.google.com [IPv6:2607:f8b0:4003:c01::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2146F1BCD; Tue, 26 Apr 2016 19:06:30 +0000 (UTC) (envelope-from asomers@gmail.com) Received: by mail-ob0-x230.google.com with SMTP id j9so11689322obd.3; Tue, 26 Apr 2016 12:06:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc; bh=5+3kuML4yPRPtbzhuXlzknwvTiePhq4U0mplYZVejVk=; b=XH+kFp4pzg41xqH7bfFJ4LlFWBQez6dKBWLIv342h2Fj7NJl5Wt6/9Ay53KgqJTHXI Ig7sYqSdJWbUyJDDUfezSLIIQAX11bw7XmwSbVsMP68pNCNwfYoQhtVW9PFGRpWEqMnv rV8C64zxVlxe/rs4FLaD+OyTGunW4wI/c0mFlXLJQ/bYrkmhqRWS2pGO8XtbrckFNh+s 5QTzAxfDXU/3yIDxAnrFVjXFjpQcgbYScEM5+pMkfTZXBzPKufURZaGDHoocgj5+GCWh pPqNofvnUksyShjDdXkLuYxgPOPzhdoMw/NUq68knnSuYdZ9mj4mghb/rhP42o0uI6pi irRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:date :message-id:subject:from:to:cc; bh=5+3kuML4yPRPtbzhuXlzknwvTiePhq4U0mplYZVejVk=; b=DLyA1AJiC/tF4aqyAGzAizXs0CllQQVIb5k79HehkHRw2yJPXXTMgQUM0nP2Kw8RIu FB0Pg9Ffcusb/5WE4G+XO6bkpX93Ka/UN+MVBXS+A66Fjyo/urS2VD6g/ASoq1h/MUnO PWx7vy3yIYS8TU1igSoJV1rsA+5CX1/BOadYEaJQWG7+me5+J/GKjOCYkf/KOrSKTYuC l1MyygPtFxTNR2JOYioqiPzIbRv1pE0eB442V7ic49aG2H8RvscvjxjgajBg/61JJxAt Jrhg3CvBfnRqsqA+51hSJdxpQwxR1CskDr8lDYD00LvKIXwP5kdi4da5VIG0RROZ3eZd E3Lw== X-Gm-Message-State: AOPr4FWqv13CToKsAvdAjJhUWmOR+EDnZtOehkYTeg3FFLvo+cBVFpgJT4y+fMcKSzfE6sciOrjkhLSLjRvKNw== MIME-Version: 1.0 X-Received: by 10.182.232.168 with SMTP id tp8mr1735600obc.65.1461697589550; Tue, 26 Apr 2016 12:06:29 -0700 (PDT) Sender: asomers@gmail.com Received: by 10.202.64.138 with HTTP; Tue, 26 Apr 2016 12:06:29 -0700 (PDT) In-Reply-To: <201604261811.u3QIBjrE092471@repo.freebsd.org> References: <201604261811.u3QIBjrE092471@repo.freebsd.org> Date: Tue, 26 Apr 2016 13:06:29 -0600 X-Google-Sender-Auth: aNLe_LUXeTjjP7L57nPZyo9U0mc Message-ID: Subject: Re: svn commit: r298655 - head/sys/kgssapi From: Alan Somers To: "Conrad E. Meyer" Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.21 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2016 19:06:30 -0000 Nice catch. Will you be MFCing this to stable/10? On Tue, Apr 26, 2016 at 12:11 PM, Conrad E. Meyer wrote: > Author: cem > Date: Tue Apr 26 18:11:45 2016 > New Revision: 298655 > URL: https://svnweb.freebsd.org/changeset/base/298655 > > Log: > kgssapi: Don't leak memory in error cases > > Reported by: Coverity > CIDs: 1007046, 1007047, 1007048 > Sponsored by: EMC / Isilon Storage Division > > Modified: > head/sys/kgssapi/gssd_prot.c > > Modified: head/sys/kgssapi/gssd_prot.c > > ============================================================================== > --- head/sys/kgssapi/gssd_prot.c Tue Apr 26 18:08:51 2016 > (r298654) > +++ head/sys/kgssapi/gssd_prot.c Tue Apr 26 18:11:45 2016 > (r298655) > @@ -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 * > } 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, gs > || !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; > >