From owner-svn-src-head@freebsd.org Tue Apr 26 19:23:36 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 7693FB19700; Tue, 26 Apr 2016 19:23:36 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-oi0-f66.google.com (mail-oi0-f66.google.com [209.85.218.66]) (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 40E281864; Tue, 26 Apr 2016 19:23:36 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-oi0-f66.google.com with SMTP id i2so3351261oib.3; Tue, 26 Apr 2016 12:23:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:reply-to:in-reply-to:references :date:message-id:subject:from:to:cc; bh=H6cBubZEYVq6I7wswBkHyZ85elhf89Kbn/aHesbhKbY=; b=h4d1XFAJZtjPvmRYNAoqB071JuoKDQ5ZDiNmioiJ3QzokemY1KmuNU9ED5ZS+nqfN8 qFut0HZ3xWO3YaNc2CUi4kUlX7MqJc828oL2wGn2KqX2qoh4bO7wyZ/B7PR0qUporp+j oERM3CG2c5d8RliYZv2aI9Fa+kikZ6YvgAObk53RlFO762L92FnPjuu7I/xJJs0xg3ho 1Uuk7ri3jja2I7AINtSVjakJX2TJWD5+vFEhRZIkjbj1H3XBHKdS2Plyy5MsgFOOcbNc EAi2/R5hQK1kkDme/zq+UMHwLedTMWmDKhOu4Iau76vVAy/KNUIDUraArDNdEkqOuuyu 9LOg== X-Gm-Message-State: AOPr4FW1GR1/+Q26ymTCP11EEXctUgq31WE+DUDw/wflZ07hIYZ4YgvaeAag9Xq23uonPw== X-Received: by 10.202.206.68 with SMTP id e65mr1064865oig.158.1461698609069; Tue, 26 Apr 2016 12:23:29 -0700 (PDT) Received: from mail-oi0-f49.google.com (mail-oi0-f49.google.com. [209.85.218.49]) by smtp.gmail.com with ESMTPSA id ke9sm134994obb.12.2016.04.26.12.23.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Apr 2016 12:23:28 -0700 (PDT) Received: by mail-oi0-f49.google.com with SMTP id x19so26018250oix.2; Tue, 26 Apr 2016 12:23:28 -0700 (PDT) MIME-Version: 1.0 X-Received: by 10.157.36.135 with SMTP id z7mr1691398ota.69.1461698608335; Tue, 26 Apr 2016 12:23:28 -0700 (PDT) Reply-To: cem@FreeBSD.org Received: by 10.157.6.111 with HTTP; Tue, 26 Apr 2016 12:23:28 -0700 (PDT) In-Reply-To: References: <201604261811.u3QIBjrE092471@repo.freebsd.org> Date: Tue, 26 Apr 2016 12:23:28 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r298655 - head/sys/kgssapi From: Conrad Meyer To: Alan Somers 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:23:36 -0000 Nope! I don't do stable/. On Tue, Apr 26, 2016 at 12:06 PM, Alan Somers wrote: > 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; >> >> >