From owner-svn-src-stable@freebsd.org  Mon May 23 04:52:28 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 8E03DB464EF;
 Mon, 23 May 2016 04:52:28 +0000 (UTC)
 (envelope-from truckman@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 5D2241975;
 Mon, 23 May 2016 04:52:28 +0000 (UTC)
 (envelope-from truckman@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4N4qRHL077904;
 Mon, 23 May 2016 04:52:27 GMT (envelope-from truckman@FreeBSD.org)
Received: (from truckman@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4N4qRmG077903;
 Mon, 23 May 2016 04:52:27 GMT (envelope-from truckman@FreeBSD.org)
Message-Id: <201605230452.u4N4qRmG077903@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: truckman set sender to
 truckman@FreeBSD.org using -f
From: Don Lewis <truckman@FreeBSD.org>
Date: Mon, 23 May 2016 04:52:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r300451 - stable/10/usr.sbin/rpc.lockd
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 May 2016 04:52:28 -0000

Author: truckman
Date: Mon May 23 04:52:27 2016
New Revision: 300451
URL: https://svnweb.freebsd.org/changeset/base/300451

Log:
  MFC r299897
  
  NULL releasedfl after calling deallocate_file_lock() which frees it
  to avoid a use-after-free error in the debuglog() call at the top
  of the loop.
  
  Reported by:	Coverity
  CID:		1006080

Modified:
  stable/10/usr.sbin/rpc.lockd/lockd_lock.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/rpc.lockd/lockd_lock.c
==============================================================================
--- stable/10/usr.sbin/rpc.lockd/lockd_lock.c	Mon May 23 04:50:01 2016	(r300450)
+++ stable/10/usr.sbin/rpc.lockd/lockd_lock.c	Mon May 23 04:52:27 2016	(r300451)
@@ -1600,6 +1600,7 @@ unlock_partialfilelock(const struct file
 				 */
 
 				deallocate_file_lock(releasedfl);
+				releasedfl = NULL;
 			}
 		}