From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 17 May 2016 04:53:47 +0000 (-0400)
Subject: misc: fix various Coverity warnings
X-Git-Tag: v1.43~3
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=051fd4e0288166c081511d5c2e0f9031415b1bea;p=tools%2Fe2fsprogs.git

misc: fix various Coverity warnings

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/misc/create_inode.c b/misc/create_inode.c
index 4dbd8e5..c879a3e 100644
--- a/misc/create_inode.c
+++ b/misc/create_inode.c
@@ -767,6 +767,7 @@ static errcode_t __populate_fs(ext2_filsys fs, ext2_ino_t parent_ino,
 				com_err(__func__, retval,
 					_("while trying to read link \"%s\""),
 					name);
+				free(ln_target);
 				goto out;
 			}
 			if (read_cnt > st.st_size) {
diff --git a/misc/e4crypt.c b/misc/e4crypt.c
index 1da25d8..04faca3 100644
--- a/misc/e4crypt.c
+++ b/misc/e4crypt.c
@@ -726,7 +726,6 @@ static void do_set_policy(int argc, char **argv, const struct cmd_desc *cmd)
 		exit(1);
 	}
 
-	strcpy(saltbuf.key_ref_str, argv[optind]);
 	if ((strlen(argv[optind]) != (EXT4_KEY_DESCRIPTOR_SIZE * 2)) ||
 	    hex2byte(argv[optind], (EXT4_KEY_DESCRIPTOR_SIZE * 2),
 		     saltbuf.key_desc, EXT4_KEY_DESCRIPTOR_SIZE)) {
@@ -737,6 +736,7 @@ static void do_set_policy(int argc, char **argv, const struct cmd_desc *cmd)
 			exit(1);
 	}
 	validate_paths(argc, argv, optind+1);
+	strcpy(saltbuf.key_ref_str, argv[optind]);
 	set_policy(&saltbuf, pad, argc, argv, optind+1);
 	exit(0);
 }
diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index e0a98e7..4f5d5c0 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -1015,10 +1015,11 @@ static void parse_extended_opts(struct ext2_super_block *param,
 			quotatype_bits = 0;
 			ret = parse_quota_types(arg, &quotatype_bits, &errtok);
 			if (ret) {
-				if (errtok)
+				if (errtok) {
 					fprintf(stderr,
 				"Failed to parse quota type at %s", errtok);
-				else
+					free(errtok);
+				} else
 					com_err(program_name, ret,
 						"while parsing quota type");
 				r_usage++;