From owner-svn-src-all@freebsd.org  Wed Apr 20 02:01:46 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 71225B15AFB;
 Wed, 20 Apr 2016 02:01:46 +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 4254F1315;
 Wed, 20 Apr 2016 02:01:46 +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 u3K21j3b039927;
 Wed, 20 Apr 2016 02:01:45 GMT (envelope-from cem@FreeBSD.org)
Received: (from cem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3K21jUc039926;
 Wed, 20 Apr 2016 02:01:45 GMT (envelope-from cem@FreeBSD.org)
Message-Id: <201604200201.u3K21jUc039926@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:01:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298329 - head/sys/net
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:01:46 -0000

Author: cem
Date: Wed Apr 20 02:01:45 2016
New Revision: 298329
URL: https://svnweb.freebsd.org/changeset/base/298329

Log:
  radix rn_inithead: Fix minor leak in low memory conditions
  
  R_Zalloc is essentially a malloc(M_NOWAIT) wrapper.  It is possible that 'rnh'
  failed to allocate, but 'rmh' succeeds.  In that case, we bail out of
  rn_inithead() but previously did not free 'rmh'.
  
  Introduced in r287073 (projects/routing) / MFP r294706.
  
  Reported by:	Coverity
  CID:		1350258
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/sys/net/radix.c

Modified: head/sys/net/radix.c
==============================================================================
--- head/sys/net/radix.c	Wed Apr 20 01:39:31 2016	(r298328)
+++ head/sys/net/radix.c	Wed Apr 20 02:01:45 2016	(r298329)
@@ -1156,6 +1156,8 @@ rn_inithead(void **head, int off)
 	if (rnh == NULL || rmh == NULL) {
 		if (rnh != NULL)
 			R_Free(rnh);
+		if (rmh != NULL)
+			R_Free(rmh);
 		return (0);
 	}