LVM2 ./WHATS_NEW lib/misc/lvm-file.c

LVM2 ./WHATS_NEW lib/misc/lvm-file.c

[prajnoha]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	prajnoha at sourceware.org	2011-06-08 08:49:54

Modified files:
	.              : WHATS_NEW 
	lib/misc       : lvm-file.c 

Log message:
	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.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.2006&r2=1.2007
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/misc/lvm-file.c.diff?cvsroot=lvm2&r1=1.27&r2=1.28

--- LVM2/WHATS_NEW	2011/06/02 09:02:03	1.2006
+++ LVM2/WHATS_NEW	2011/06/08 08:49:53	1.2007
@@ -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.
--- LVM2/lib/misc/lvm-file.c	2009/07/15 20:02:47	1.27
+++ LVM2/lib/misc/lvm-file.c	2011/06/08 08:49:54	1.28
@@ -35,6 +35,7 @@
 	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 @@
 		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++) {
 

LVM2 ./WHATS_NEW lib/misc/lvm-file.c

[meyering]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	meyering at sourceware.org	2007-07-28 15:20:36

Modified files:
	.              : WHATS_NEW 
	lib/misc       : lvm-file.c 

Log message:
	Don't leak a file descriptor in fcntl_lock_file(), when fcntl fails.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.673&r2=1.674
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/misc/lvm-file.c.diff?cvsroot=lvm2&r1=1.22&r2=1.23

--- LVM2/WHATS_NEW	2007/07/28 12:26:21	1.673
+++ LVM2/WHATS_NEW	2007/07/28 15:20:36	1.674
@@ -1,5 +1,6 @@
 Version 2.02.28 -
 ================================
+  Don't leak a file descriptor in fcntl_lock_file(), when fcntl fails.
   Remove create_dir function; use now-equivalent dm_create_dir instead
   Detect stream write failure reliably; new fn: lvm_fclose; use dm_fclose
   Fix clvmd if compiled with gulm support. (2.02.26)
--- LVM2/lib/misc/lvm-file.c	2007/07/28 12:26:21	1.22
+++ LVM2/lib/misc/lvm-file.c	2007/07/28 15:20:36	1.23
@@ -245,6 +245,7 @@
 
 	if (fcntl(lockfd, F_SETLKW, &lock)) {
 		log_sys_error("fcntl", file);
+		close(lockfd);
 		return -1;
 	}