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 4dbd8e5466d36e537f8c05c08c23819c3bf81956..c879a3ec7219c2820ecdcf939acf7905bf9c9b4b 100644 (file)
--- 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 1da25d85ffc93ca06db6d29a4589b0940b01edb5..04faca3221deae50eff4f90baadba00709ed95aa 100644 (file)
--- 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 e0a98e75537a7f781e8c05b1f6607ac391d5fee7..4f5d5c0d30c230b54803d32068e32fd754e43e6d 100644 (file)
--- 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++;