From owner-svn-src-projects@freebsd.org Sun Apr 17 20:45:53 2016 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@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 D1924B118B6 for <svn-src-projects@mailman.ysv.freebsd.org>; Sun, 17 Apr 2016 20:45:53 +0000 (UTC) (envelope-from rmacklem@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 A20961AAC; Sun, 17 Apr 2016 20:45:53 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3HKjqLv063462; Sun, 17 Apr 2016 20:45:52 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3HKjqwm063461; Sun, 17 Apr 2016 20:45:52 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201604172045.u3HKjqwm063461@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem <rmacklem@FreeBSD.org> Date: Sun, 17 Apr 2016 20:45:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r298158 - projects/pnfs-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.21 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 17 Apr 2016 20:45:53 -0000 Author: rmacklem Date: Sun Apr 17 20:45:52 2016 New Revision: 298158 URL: https://svnweb.freebsd.org/changeset/base/298158 Log: Fix a possible memory leak for a case when the new layout wouldn't be used and needs to be free'd. Found by code inspection. Modified: projects/pnfs-server/sys/fs/nfsserver/nfs_nfsdstate.c Modified: projects/pnfs-server/sys/fs/nfsserver/nfs_nfsdstate.c ============================================================================== --- projects/pnfs-server/sys/fs/nfsserver/nfs_nfsdstate.c Sun Apr 17 20:00:24 2016 (r298157) +++ projects/pnfs-server/sys/fs/nfsserver/nfs_nfsdstate.c Sun Apr 17 20:45:52 2016 (r298158) @@ -6407,8 +6407,6 @@ nfsrv_addlayout(struct nfsrv_descript *n NFSUNLOCKSTATE(); return (0); } - stp = *stpp; - *stpp = NULL; error = nfsrv_getclient((nfsquad_t)((u_quad_t)0), CLOPS_RENEW, &clp, NULL, (nfsquad_t)((u_quad_t)0), 0, nd, NULL); @@ -6418,6 +6416,8 @@ nfsrv_addlayout(struct nfsrv_descript *n } /* Insert the new layout in the lists. */ + stp = *stpp; + *stpp = NULL; stp->ls_flags = NFSLCK_LAYOUT; stp->ls_stateid.seqid = 1; stp->ls_stateid.other[0] = stateidp->other[0] =