From fce515b864024bd4d25c55063f0d0835986a01f9 Mon Sep 17 00:00:00 2001 From: neilbrown Date: Mon, 11 Aug 2003 05:55:49 +0000 Subject: [PATCH 1/1] close a filehandle before opening. --- ChangeLog | 4 ++++ utils/mountd/cache.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 81ccf88..ec81bb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-08-11 NeilBrown + * utils/mountd/cache.c(cache_get_filehandle): close the filehandle + before returning. + 2003-08-04 NeilBrown * support/include/nfs/export.h, support/nfs/exports.c, utils/exportfs/exports.c, utils/mountd/mountd.c: change diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c index 96492b8..a265ecd 100644 --- a/utils/mountd/cache.c +++ b/utils/mountd/cache.c @@ -376,6 +376,7 @@ cache_get_filehandle(nfs_export *exp, int len, char *p) FILE *f = fopen("/proc/fs/nfsd/filehandle", "r+"); char buf[200]; char *bp = buf; + int failed; static struct nfs_fh_len fh; if (!f) @@ -388,7 +389,9 @@ cache_get_filehandle(nfs_export *exp, int len, char *p) qword_printint(f, len); qword_eol(f); - if (fgets(buf, sizeof(buf), f) == NULL) + failed = (fgets(buf, sizeof(buf), f) == NULL); + fclose(f); + if (failed) return NULL; memset(fh.fh_handle, 0, sizeof(fh.fh_handle)); fh.fh_size = qword_get(&bp, fh.fh_handle, NFS3_FHSIZE); -- 2.39.2