From 73f4ccbd29840a18a1df5a5c301f2a0a6e1083ef Mon Sep 17 00:00:00 2001 From: Rick Macklem Date: Tue, 23 Jun 2009 21:48:04 +0000 Subject: [PATCH] When mountd.c parses the nfsv4 root line(s) in /etc/exports, it allocates data structures that are never linked into the tree or free'd. As such, mountd would leak memory every time it parsed an nfsv4 root line. This patch frees up those structures to plug the leak. Approved by: kib (mentor) --- usr.sbin/mountd/mountd.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c index b6ca3cd32e6f..6fcb88447910 100644 --- a/usr.sbin/mountd/mountd.c +++ b/usr.sbin/mountd/mountd.c @@ -1414,8 +1414,20 @@ get_exportlist_one() /* * For V4: don't enter in mount lists. */ - if (v4root_phase > 0 && v4root_phase <= 2) + if (v4root_phase > 0 && v4root_phase <= 2) { + /* + * Since these structures aren't used by mountd, + * free them up now. + */ + if (ep != NULL) + free_exp(ep); + while (tgrp != NULL) { + grp = tgrp; + tgrp = tgrp->gr_next; + free_grp(grp); + } goto nextline; + } /* * Success. Update the data structures.