2010-01-28 21:26:35

by Ben Myers

[permalink] [raw]
Subject: [PATCH 2/3] nfs-utils: dont leak fd in mountlist_list

Don't leak this file descriptor if stat should fail.
---
utils/mountd/rmtab.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/utils/mountd/rmtab.c b/utils/mountd/rmtab.c
index b028529..19b22ee 100644
--- a/utils/mountd/rmtab.c
+++ b/utils/mountd/rmtab.c
@@ -24,6 +24,7 @@
#include "ha-callout.h"

#include <limits.h> /* PATH_MAX */
+#include <errno.h>

extern int reverse_resolve;

@@ -187,7 +188,9 @@ mountlist_list(void)
if ((lockid = xflock(_PATH_RMTABLCK, "r")) < 0)
return NULL;
if (stat(_PATH_RMTAB, &stb) < 0) {
- xlog(L_ERROR, "can't stat %s", _PATH_RMTAB);
+ xlog(L_ERROR, "can't stat %s: %s",
+ _PATH_RMTAB, strerror(errno));
+ xfunlock(lockid);
return NULL;
}
if (stb.st_mtime != last_mtime) {