Merge lp:~colin-king/ecryptfs/misc-fixes into lp:ecryptfs

[Colin Ian King]

I've found a bunch of minor bugs which I've fixed up and I've given them a cursory check to see if they are OK and don't regress eCryptfs but I'd like somebody to eyeball them before merging if that's OK.

[Tyler Hicks (tyhicks)]

Thanks, Colin! The only thing that caught my eye was the off_t to size_t changes. Since we're dealing with a file size, we should be using off_t rather than ssize_t (ssize_t wraps at 2GB on 32 bit machines). But, I see where other portions of that test use ssize_t so this change doesn't make us any worse off than what we already are at this point.

review: Approve

=== modified file 'src/libecryptfs/decision_graph.c'
--- src/libecryptfs/decision_graph.c	2009-05-29 14:03:56 +0000
+++ src/libecryptfs/decision_graph.c	2013-06-07 13:34:31 +0000
@@ -949,6 +949,7 @@
 					param_node->val))) {
 		syslog(LOG_ERR, "%s: Cannot find key_mod for param_node with "
 		       "val = [%s]\n", __FUNCTION__, param_node->val);
+		free(subgraph_ctx);
 		goto out;
 	}
 	(*foo) = (void *)subgraph_ctx;
@@ -984,6 +985,7 @@
 	memset(val_node, 0, sizeof(struct val_node));
 	if ((rc = asprintf((char **)&val_node->val, "%s", param_node->val))
 	    == -1) {
+		free(val_node);
 		rc = -ENOMEM;
 		goto out;
 	}

=== modified file 'src/libecryptfs/key_management.c'
--- src/libecryptfs/key_management.c	2012-10-03 19:58:04 +0000
+++ src/libecryptfs/key_management.c	2013-06-07 13:34:31 +0000
@@ -257,7 +257,6 @@
 		syslog(LOG_ERR, "Error attempting to open [%s] for reading\n",
 		       src);
 		rc = -EIO;
-		close(fd);
 		goto out;
 	}
 	if ((size = read(fd, decrypted_passphrase,

=== modified file 'src/libecryptfs/main.c'
--- src/libecryptfs/main.c	2012-04-26 21:03:38 +0000
+++ src/libecryptfs/main.c	2013-06-07 13:34:31 +0000
@@ -116,10 +116,12 @@
 	} else {
 		flockfile(fh);
 		if ((mnt = (char *)malloc(MAXPATHLEN+1)) == NULL) {
+			fclose(fh);
 			perror("malloc");
 			return NULL;
 		}
 		if (fgets(mnt, MAXPATHLEN, fh) == NULL) {
+			free(mnt);
 			mnt = mnt_default;
 		} else {
 			/* Ensure that mnt doesn't contain newlines */

=== modified file 'src/libecryptfs/module_mgr.c'
--- src/libecryptfs/module_mgr.c	2012-07-11 09:12:11 +0000
+++ src/libecryptfs/module_mgr.c	2013-06-07 13:34:31 +0000
@@ -578,7 +578,7 @@
 static int init_ecryptfs_cipher_param_node()
 {
 	struct cipher_descriptor *cd = cipher_descriptors;
-	int rc;
+	int rc = 0;
 
 	while (cd && cd->name) {
 		struct transition_node *tn;

=== modified file 'src/utils/io.c'
--- src/utils/io.c	2009-05-29 14:03:56 +0000
+++ src/utils/io.c	2013-06-07 13:34:31 +0000
@@ -201,7 +201,7 @@
 	if (!confirmed_pass) {
 		rc = -ENOMEM;
 		ecryptfs_syslog(LOG_ERR, "Failed to allocate memory\n");
-		goto out;
+		goto ret;
 	}
 	mlock(confirmed_pass, ECRYPTFS_MAX_PASSWORD_LENGTH);
 	printf("\n\tMount-wide passphrase: ");
@@ -229,6 +229,7 @@
 out:
 	memset(confirmed_pass, 0, ECRYPTFS_MAX_PASSWORD_LENGTH);
 	free(confirmed_pass);
+ret:
 	return rc;
 }
 

=== modified file 'src/utils/mount.ecryptfs_private.c'
--- src/utils/mount.ecryptfs_private.c	2012-12-04 20:00:49 +0000
+++ src/utils/mount.ecryptfs_private.c	2013-06-07 13:34:31 +0000
@@ -108,11 +108,13 @@
 	int i;
 	char c;
 	int len;
+
+	if (u == NULL)
+		goto empty;
 	len = strlen(u);
-	if (u == NULL || len == 0) {
-		fputs("Username is empty\n", stderr);
-		return 1;
-	}
+	if (len == 0)
+		goto empty;
+
 	for (i=0; i<len; i++) {
 		c = u[i];
 		if ( 	!(c>='a' && c<='z') && !(c>='A' && c<='Z') &&
@@ -126,6 +128,9 @@
 		}
 	}
 	return 0;
+empty:
+	fputs("Username is empty\n", stderr);
+	return 1;
 }
 
 char **fetch_sig(char *pw_dir, char *alias, int mounting) {
@@ -390,8 +395,10 @@
 		    (fstat(fd, &s)==0 && (S_ISREG(s.st_mode) && s.st_uid==uid))) {
 			break;
 		} else {
-			if (fd >= 0)
+			if (fd >= 0) {
 				close(fd);
+				fd = -1;
+			}
 			free(f);
 			if (asprintf(&f, "%s/%s-%s-%s-%d", TMP, FSTYPE, u,
 			    alias, i++) < 0) {

=== modified file 'tests/kernel/inotify/test.c'
--- tests/kernel/inotify/test.c	2012-01-31 13:55:17 +0000
+++ tests/kernel/inotify/test.c	2013-06-07 13:34:31 +0000
@@ -269,6 +269,7 @@
 {
 	int fd;
 	char buffer[1];
+	int rc = 0;
 
 	if ((fd = open(path, O_RDONLY)) < 0) {
 		fprintf(stderr, "Cannot open %s: %s\n", path, strerror(errno));
@@ -278,9 +279,12 @@
 	/* Just want to force an access */
 	if (read(fd, buffer, 1) < 0) {
 		fprintf(stderr, "Cannot read %s: %s\n", path, strerror(errno));
-		return -1;
+		rc = -1;
 	}
-	return 0;
+
+	close(fd);
+	
+	return rc;
 }
 
 int test_access_file(char *path)
@@ -301,23 +305,27 @@
 int test_modify_helper(char *path, void *dummy)
 {
 	int fd;
-	char buffer[1];
+	char buffer[1] = { 0 };
+	int rc = 0;
 
 	if (mk_file(path, 4096) < 0)
 		return -1;
 
 	if ((fd = open(path, O_RDWR)) < 0) {
 		fprintf(stderr, "Cannot open %s: %s\n", path, strerror(errno));
-		return -1;
+		rc = -1;
+		goto remove;
 	}
 
 	if (write(fd, buffer, 1) < 0) {
-		fprintf(stderr, "Cannot read %s: %s\n", path, strerror(errno));
-		(void)unlink(path);
-		return -1;
+		fprintf(stderr, "Cannot write %s: %s\n", path, strerror(errno));
+		rc = -1;
 	}
+
+	close(fd);
+remove:
 	(void)unlink(path);
-	return 0;
+	return rc;
 }
 
 int test_modify_file(char *path)

=== modified file 'tests/kernel/trunc-file/test.c'
--- tests/kernel/trunc-file/test.c	2013-03-13 14:55:11 +0000
+++ tests/kernel/trunc-file/test.c	2013-06-07 13:34:31 +0000
@@ -84,10 +84,12 @@
 
 		if (write_buff(fd, buff, n) < 0) {
 			close(fd);
-			return TEST_FAILED;
+			return -1;
 		}
 		buflen -= n;
 	}
+
+	return 0;
 }
 
 int test_read_random(char *filename, int fd, unsigned char *buff, ssize_t size)
@@ -253,7 +255,7 @@
 
 int main(int argc, char **argv)
 {
-	off_t len = DEFAULT_SIZE;
+	ssize_t len = DEFAULT_SIZE;
 	int i;
 	int ret;
 
@@ -278,5 +280,5 @@
 
 	signal(SIGINT, sighandler);
 
-	exit(test_exercise(argv[1], (ssize_t)len));
+	exit(test_exercise(argv[1], len));
 }

=== modified file 'tests/userspace/wrap-unwrap/test.c'
--- tests/userspace/wrap-unwrap/test.c	2012-11-02 23:20:18 +0000
+++ tests/userspace/wrap-unwrap/test.c	2013-06-07 13:34:31 +0000
@@ -102,7 +102,7 @@
 	if ((rc = ecryptfs_wrap_passphrase(path, "testwrappw", salt,
 					   passphrase)) == 0) {
 		fprintf(stderr, "ecryptfs_wrap_passphrase() returned rc = 0; "
-			"expected error result instead\n", rc);
+			"expected error result instead\n");
 		rc = 1;
 		goto out;
 	}