From: Peter Rajnoha <prajnoha@redhat.com>
Date: Wed, 8 Jun 2011 08:49:53 +0000 (+0000)
Subject: Fix create_temp_name to replace any '/' found in the hostname with '?'.
X-Git-Tag: old-v2_02_86~102
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=fab0de8998793046711ac98058b28ea7362f1b0f;p=lvm2.git

Fix create_temp_name to replace any '/' found in the hostname with '?'.

There's a possibility someone will use the '/' in the hostname. Since we
generate a temporary file name (path) including the hostname, any '/' would
be ambiguous.

We can always set such hostname using 'sethostname' from unistd.h. But the
'hostname' command already includes the check and removes the '/' char.
However, some old versions still allow that.
See: https://bugzilla.redhat.com/show_bug.cgi?id=711445.

Since this is only a temporary name and the possibility of this error is
quite negligible, we don't need any complex escape sequence here, just a
simple char replace.
---

diff --git a/WHATS_NEW b/WHATS_NEW
index 7c14bc099..01032aed6 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.86 -  
 =================================
+  Fix create_temp_name to replace any '/' found in the hostname with '?'.
   Always use append to file in lvmdump (selinux policy - no file truncation).
   Propagate test mode to clvmd to skip activation and changes to held locks.
   Defer writing PV labels to vg_write.
diff --git a/lib/misc/lvm-file.c b/lib/misc/lvm-file.c
index f577840bf..6e50cf814 100644
--- a/lib/misc/lvm-file.c
+++ b/lib/misc/lvm-file.c
@@ -35,6 +35,7 @@ int create_temp_name(const char *dir, char *buffer, size_t len, int *fd,
 	int i, num;
 	pid_t pid;
 	char hostname[255];
+	char *p;
 	struct flock lock = {
 		.l_type = F_WRLCK,
 		.l_whence = 0,
@@ -48,6 +49,12 @@ int create_temp_name(const char *dir, char *buffer, size_t len, int *fd,
 		log_sys_error("gethostname", "");
 		strcpy(hostname, "nohostname");
 	}
+	else {
+		/* Replace any '/' with '?' found in the hostname. */
+		p = hostname;
+		while ((p = strchr(p, '/')))
+			*p = '?';
+	}
 
 	for (i = 0; i < 20; i++, num++) {