From owner-svn-src-all@freebsd.org  Wed Apr 20 02:09:39 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 55DE6B15CE7;
 Wed, 20 Apr 2016 02:09:39 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2827916EE;
 Wed, 20 Apr 2016 02:09:39 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3K29cWc040226;
 Wed, 20 Apr 2016 02:09:38 GMT (envelope-from cem@FreeBSD.org)
Received: (from cem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3K29cpR040225;
 Wed, 20 Apr 2016 02:09:38 GMT (envelope-from cem@FreeBSD.org)
Message-Id: <201604200209.u3K29cpR040225@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org
 using -f
From: "Conrad E. Meyer" <cem@FreeBSD.org>
Date: Wed, 20 Apr 2016 02:09:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298330 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Apr 2016 02:09:39 -0000

Author: cem
Date: Wed Apr 20 02:09:38 2016
New Revision: 298330
URL: https://svnweb.freebsd.org/changeset/base/298330

Log:
  kern_rctl: Fix resource leak in error path
  
  Ordinarily, rctl_write_outbuf frees 'sb'.  However, if we are in low memory
  conditions we skip past the rctl_write_outbuf.  In that case, free 'sb'.
  
  Reported by:	Coverity
  CID:		1338539
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/sys/kern/kern_rctl.c

Modified: head/sys/kern/kern_rctl.c
==============================================================================
--- head/sys/kern/kern_rctl.c	Wed Apr 20 02:01:45 2016	(r298329)
+++ head/sys/kern/kern_rctl.c	Wed Apr 20 02:09:38 2016	(r298330)
@@ -1866,6 +1866,7 @@ sys_rctl_get_limits(struct thread *td, s
 	RCTL_RUNLOCK();
 	if (sbuf_error(sb) == ENOMEM) {
 		error = ERANGE;
+		sbuf_delete(sb);
 		goto out;
 	}