Check for symlinks before attempting create.

Check for symlinks before attempting create. When attempting to create the compulsory symlinks in /dev, check for the existence of the link using stat first before blindly attempting to create the link. This works around an apparent quirk in the kernel VFS on read-only file systems where the returned error code might be EEXIST or EROFS depending on previous access to the /dev directory and its entries. Reported-by: William Dauchy <william@gandi.net> Signed-off-by: Michael H. Warfield <mhw@WittsEnd.com> Tested-by: William Dauchy <william@gandi.net>

Check for symlinks before attempting create.
09227be2 · Michael H. Warfield · Serge Hallyn · 276a0862 · 09227be2
Commit 09227be2 authored Apr 25, 2014 by Michael H. Warfield Committed by Serge Hallyn Apr 28, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 2 deletions

conf.c src/lxc/conf.c +17 -2

No files found.
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -828,6 +828,7 @@ static int setup_dev_symlinks(const struct lxc_rootfs *rootfs)
 {
 	char path[MAXPATHLEN];
 	int ret,i;
+	struct stat s;


 	for (i = 0; i < sizeof(dev_symlinks) / sizeof(dev_symlinks[0]); i++) {
@@ -835,10 +836,24 @@ static int setup_dev_symlinks(const struct lxc_rootfs *rootfs)
 		ret = snprintf(path, sizeof(path), "%s/dev/%s", rootfs->mount, d->name);
 		if (ret < 0 || ret >= MAXPATHLEN)
 			return -1;
+
+		/*
+		 * Stat the path first.  If we don't get an error
+		 * accept it as is and don't try to create it
+		 */
+		if (!stat(path, &s)) {
+			continue;
+		}
+
 		ret = symlink(d->oldpath, path);
+
 		if (ret && errno != EEXIST) {
-			SYSERROR("Error creating %s", path);
-			return -1;
+			if ( errno == EROFS ) {
+				WARN("Warning: Read Only file system while creating %s", path);
+			} else {
+				SYSERROR("Error creating %s", path);
+				return -1;
+			}
 		}
 	}
 	return 0;