From owner-svn-src-projects@FreeBSD.ORG  Thu Jan  2 23:17:49 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4DDA5C8E;
 Thu,  2 Jan 2014 23:17:49 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3A2CC1DF2;
 Thu,  2 Jan 2014 23:17:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s02NHnRm038719;
 Thu, 2 Jan 2014 23:17:49 GMT (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s02NHnrS038718;
 Thu, 2 Jan 2014 23:17:49 GMT (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201401022317.s02NHnrS038718@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Thu, 2 Jan 2014 23:17:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r260209 - projects/nfsv4.1-server/sys/fs/nfsserver
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Jan 2014 23:17:49 -0000

Author: rmacklem
Date: Thu Jan  2 23:17:48 2014
New Revision: 260209
URL: http://svnweb.freebsd.org/changeset/base/260209

Log:
  Carry one missed patch over from the pre-updated source tree.

Modified:
  projects/nfsv4.1-server/sys/fs/nfsserver/nfs_nfsdserv.c

Modified: projects/nfsv4.1-server/sys/fs/nfsserver/nfs_nfsdserv.c
==============================================================================
--- projects/nfsv4.1-server/sys/fs/nfsserver/nfs_nfsdserv.c	Thu Jan  2 21:57:03 2014	(r260208)
+++ projects/nfsv4.1-server/sys/fs/nfsserver/nfs_nfsdserv.c	Thu Jan  2 23:17:48 2014	(r260209)
@@ -3872,7 +3872,7 @@ nfsrvd_createsession(struct nfsrv_descri
 		*tl = txdr_unsigned(0);			/* No RDMA. */
 	}
 nfsmout:
-	if (nd->nd_repstat != 0)
+	if (nd->nd_repstat != 0 && sep != NULL)
 		free(sep, M_NFSDSESSION);
 	NFSEXITCODE2(error, nd);
 	return (error);