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

[Colin Ian King]

I've got around to sort out a few more issues found with Coverity Scan. I believe these are all minor bugs that aren't show stoppers, but need attention. I'd appreciate these being reviewed as I believe they are OK, but I'm not 100% sure I've touched all the changes with the testing I've done.

Thanks

=== modified file 'configure.ac'
--- configure.ac	2013-06-11 13:26:48 +0000
+++ configure.ac	2013-07-05 15:55:29 +0000
@@ -37,7 +37,7 @@
 #
 # For more details:
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-LIBECRYPTFS_LT_CURRENT="0"
+LIBECRYPTFS_LT_CURRENT="1"
 LIBECRYPTFS_LT_REVISION="0"
 LIBECRYPTFS_LT_AGE="0"
 AC_SUBST([LIBECRYPTFS_LT_CURRENT])
 
=== modified file 'src/daemon/main.c'
--- src/daemon/main.c	2012-11-02 14:31:32 +0000
+++ src/daemon/main.c	2013-07-05 15:55:29 +0000
@@ -210,7 +210,7 @@
 		exit(1);
 	}
 	for (fd=0; fd < 3; fd++) {
-		if (dup2(null, 0) == -1) {
+		if (dup2(null, fd) == -1) {
 			syslog(LOG_ERR, "Failed to dup null: %m\n");
 			exit(1);
 		}
 
=== modified file 'src/libecryptfs/cmd_ln_parser.c'
--- src/libecryptfs/cmd_ln_parser.c	2011-12-14 17:23:53 +0000
+++ src/libecryptfs/cmd_ln_parser.c	2013-07-05 15:55:29 +0000
@@ -239,7 +239,7 @@
 int process_comma_tok(struct ecryptfs_name_val_pair **current, char *tok,
 		      /*@null@*/ char *prefix)
 {
-	int tok_len = (int)strlen(tok);
+	int tok_len;
 	char new_prefix[MAX_TOK_LEN];
 	char sub_token[MAX_TOK_LEN];
 	char *name = NULL;
@@ -247,9 +247,10 @@
 	int i, j, st_len;
 	int rc = 0;
 
-	if(tok && tok[0] == '\0') {
+	if (!tok || (tok && tok[0] == '\0')) {
 		goto out;
 	}
+	tok_len = (int)strlen(tok);
 	if (tok_len < 0 || tok_len > MAX_TOK_LEN) {
 		rc = -EINVAL;
 		goto out;
@@ -304,10 +305,10 @@
 		memcpy(name, sub_token, i);
 		name[i] = '\0';
 	} else {
-		if((i-j) > 1) {
+		if ((i-j) > 1) {
 			if (!(value = malloc(i - j + 1))) {
 				rc = -ENOMEM;
-				goto out;
+				goto out_free_name;
 			}
 			memcpy(value, &sub_token[j+1], (i - j));
 			value[(i - j)] = '\0';
@@ -316,7 +317,7 @@
 	if (!((*current)->next =
 	      malloc(sizeof(struct ecryptfs_name_val_pair)))) {
 		rc = -ENOMEM;
-		goto out;
+		goto out_free_value;
 	}
 	memset((*current)->next, 0, sizeof(struct ecryptfs_name_val_pair));
 	if (strlen(name) == 0) {
@@ -328,6 +329,12 @@
 		(*current)->value = value;
 		(*current)->next = NULL;
 	}
+	return rc;
+
+out_free_value:
+	free(value);
+out_free_name:
+	free(name);
 out:
 	return rc;
 }
 
=== modified file 'src/libecryptfs/decision_graph.c'
--- src/libecryptfs/decision_graph.c	2013-06-06 09:37:37 +0000
+++ src/libecryptfs/decision_graph.c	2013-07-05 15:55:29 +0000
@@ -143,24 +143,6 @@
 	return set_exit_param_node_for_node(param_node, exit_param_node, 1);
 }
 
-/**
- * set_exit_param_node_for_arr
- *
- * Sets the exit param node for all NULL transitions contained in an
- * array of param nodes.
- */
-int set_exit_param_node_for_arr(struct param_node param_node_arr[],
-				struct param_node *exit_param_node)
-{
-	int arr_len = sizeof(param_node_arr) / sizeof(param_node_arr[0]);
-	int i;
-
-	for (i = 0; i < arr_len; i++)
-		set_exit_param_node_for_node(&param_node_arr[i],
-					     exit_param_node, 0);
-	return 0;
-}
-
 void ecryptfs_destroy_nvp(struct ecryptfs_name_val_pair *nvp)
 {
 	return;
@@ -1155,7 +1137,7 @@
 	tmp_tn->trans_func = &ecryptfs_enter_linear_subgraph_tf;
 	rc = 0;
 	param_node = NULL;
-	for (i = 0; i < num_params; i++) {
+	for (i = 0; params && i < num_params; i++) {
 		if ((param_node = malloc(sizeof(struct param_node))) == NULL) {
 			rc = -ENOMEM;
 			goto out;
 
=== modified file 'src/utils/mount.ecryptfs.c'
--- src/utils/mount.ecryptfs.c	2012-07-13 14:40:45 +0000
+++ src/utils/mount.ecryptfs.c	2013-07-05 15:55:29 +0000
@@ -343,21 +343,8 @@
 			next_opt++;
 		if (!strncmp(opt, option, option_len))
 			return 1;
-		else {
+		else
 			opt = next_opt;
-			continue;
-		}
-		if (!next_opt) {
-			if (opt != options)
-				end = --opt;
-			else
-				end = options;
-			*end = '\0';
-			break;
-		}
-		memcpy(opt, next_opt, end - next_opt);
-		end = end - (next_opt - opt);
-		*end = '\0';
 	}
 	return 0;
 }
 
=== modified file 'tests/kernel/trunc-file/test.c'
--- tests/kernel/trunc-file/test.c	2013-06-06 09:00:59 +0000
+++ tests/kernel/trunc-file/test.c	2013-07-05 15:55:29 +0000
@@ -256,6 +256,7 @@
 int main(int argc, char **argv)
 {
 	ssize_t len = DEFAULT_SIZE;
+	const ssize_t max_len = SSIZE_MAX / 1024;
 	int i;
 	int ret;
 
@@ -272,13 +273,11 @@
 		}
 	}
 
-	len *= 1024;
-	if (len > SSIZE_MAX) {
-		fprintf(stderr, "size should be < %zd\n", (ssize_t)SSIZE_MAX / 1024);
+	if (len > max_len) {
+		fprintf(stderr, "size should be < %zd\n", max_len);
 		exit(TEST_ERROR);
 	}
-
 	signal(SIGINT, sighandler);
 
-	exit(test_exercise(argv[1], len));
+	exit(test_exercise(argv[1], len * 1024));
 }