This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
master - gfs2: randomize debugfs mount point even more
- From: "Fabio M. Di Nitto" <fabbione at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Thu, 30 Oct 2008 08:44:36 +0000 (UTC)
- Subject: master - gfs2: randomize debugfs mount point even more
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=b75c1decdc435bf00f82a6b39ac30b8601197e64
Commit: b75c1decdc435bf00f82a6b39ac30b8601197e64
Parent: d76deecc67513ccd84177361b4c1f854f80c71d5
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate: Thu Oct 30 09:43:07 2008 +0100
Committer: Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Thu Oct 30 09:43:07 2008 +0100
gfs2: randomize debugfs mount point even more
18b24ae55c3e4abdc256a3b6c4f15ae0116a0f14 didn't introduce enough
security.
Switch to mkdtemp(3) and cleanup unrequired code as a consequence.
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
gfs2/tool/misc.c | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/gfs2/tool/misc.c b/gfs2/tool/misc.c
index 3e223d0..7432ea1 100644
--- a/gfs2/tool/misc.c
+++ b/gfs2/tool/misc.c
@@ -102,7 +102,7 @@ print_lockdump(int argc, char **argv)
char *name, line[PATH_MAX];
char *debugfs;
FILE *file;
- int rc = -1, debug_dir_existed = 1;
+ int rc = -1;
/* See if debugfs is mounted, and if not, mount it. */
debugfs = find_debugfs_mount();
@@ -110,19 +110,18 @@ print_lockdump(int argc, char **argv)
debugfs = malloc(PATH_MAX);
if (!debugfs)
die("Can't allocate memory for debugfs.\n");
+
memset(debugfs, 0, PATH_MAX);
- sprintf(debugfs, "/tmp/debugfs.%d", getpid());
-
- if (access(debugfs, F_OK)) {
- debug_dir_existed = mkdir(debugfs, 644);
- if (debug_dir_existed) {
- fprintf(stderr,
- "Can't create %s mount point.\n",
- debugfs);
- free(debugfs);
- exit(-1);
- }
+ sprintf(debugfs, "/tmp/debugfs.XXXXXX");
+
+ if (!mkdtemp(debugfs)) {
+ fprintf(stderr,
+ "Can't create %s mount point.\n",
+ debugfs);
+ free(debugfs);
+ exit(-1);
}
+
rc = mount("none", debugfs, "debugfs", 0, NULL);
if (rc) {
fprintf(stderr,
@@ -153,10 +152,7 @@ print_lockdump(int argc, char **argv)
/* Check if we mounted the debugfs and if so, unmount it. */
if (!rc) {
umount(debugfs);
- /* Check if we created the debugfs mount point and if so,
- delete it. */
- if (!debug_dir_existed)
- rmdir(debugfs);
+ rmdir(debugfs);
}
free(debugfs);
}