Fixes for issues found with cppcheck tool

The patch fixes small number of errors/false positives reported by `cppcheck`,
static analysis tool for C/C++.

cppcheck 1.72

$ cppcheck . --force --quiet
[cmd/zfs/zfs_main.c:4444]: (error) Possible null pointer dereference: who_perm
[cmd/zfs/zfs_main.c:4445]: (error) Possible null pointer dereference: who_perm
[cmd/zfs/zfs_main.c:4446]: (error) Possible null pointer dereference: who_perm
[cmd/zpool/zpool_iter.c:317]: (error) Uninitialized variable: nvroot
[cmd/zpool/zpool_vdev.c:1526]: (error) Memory leak: child
[lib/libefi/rdwr_efi.c:1118]: (error) Memory leak: efi_label
[lib/libuutil/uu_misc.c:207]: (error) va_list 'args' was opened but not closed by va_end().
[lib/libzfs/libzfs_import.c:1554]: (error) Dangerous usage of 'diskname' (strncpy doesn't always null-terminate it).
[lib/libzfs/libzfs_sendrecv.c:3279]: (error) Dereferencing 'cp' after it is deallocated / released
[tests/zfs-tests/cmd/file_write/file_write.c:154]: (error) Possible null pointer dereference: operation
[tests/zfs-tests/cmd/randfree_file/randfree_file.c:90]: (error) Memory leak: buf
[cmd/zinject/zinject.c:1068]: (error) Uninitialized variable: dataset
[module/icp/io/sha2_mod.c:698]: (error) Uninitialized variable: blocks_per_int64

Signed-off-by: Gvozden Neskovic <neskovic@gmail.com>
Signed-off-by: Chunwei Chen <david.chen@osnexus.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #1392

diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c
index e8a4421ccf872f88125614773c96250522401348..8a8f56af9928639d63b4a5e983199526ee6d08f0 100644 (file)
--- a/cmd/zfs/zfs_main.c
+++ b/cmd/zfs/zfs_main.c
@@ -4553,7 +4553,7 @@ parse_fs_perm(fs_perm_t *fsperm, nvlist_t *nvl)
                                who_perm = &node->who_perm;
                        }
                }
-
+               VERIFY3P(who_perm, !=, NULL);
                (void) parse_who_perm(who_perm, nvl2, perm_locality);
        }
 

diff --git a/cmd/zinject/zinject.c b/cmd/zinject/zinject.c
index e687b733c43a10004df5e2c8e331c5f90fd671f5..7e8381325e57964ded346e4e9c0fff9d4586fac9 100644 (file)
--- a/cmd/zinject/zinject.c
+++ b/cmd/zinject/zinject.c
@@ -663,8 +663,8 @@ main(int argc, char **argv)
        err_type_t type = TYPE_INVAL;
        err_type_t label = TYPE_INVAL;
        zinject_record_t record = { 0 };
-       char pool[MAXNAMELEN];
-       char dataset[MAXNAMELEN];
+       char pool[MAXNAMELEN] = "";
+       char dataset[MAXNAMELEN] = "";
        zfs_handle_t *zhp = NULL;
        int nowrites = 0;
        int dur_txg = 0;

diff --git a/cmd/zpool/zpool_iter.c b/cmd/zpool/zpool_iter.c
index a18ccf29df33ac8706337f91f3acd99cc306aa22..1b64a5a5c9f2c276917d6e7f442978872cdaecbc 100644 (file)
--- a/cmd/zpool/zpool_iter.c
+++ b/cmd/zpool/zpool_iter.c
@@ -308,7 +308,7 @@ for_each_vdev_cb(zpool_handle_t *zhp, nvlist_t *nv, pool_vdev_iter_f func,
 int
 for_each_vdev(zpool_handle_t *zhp, pool_vdev_iter_f func, void *data)
 {
-       nvlist_t *config, *nvroot;
+       nvlist_t *config, *nvroot = NULL;
 
        if ((config = zpool_get_config(zhp, NULL)) != NULL) {
                verify(nvlist_lookup_nvlist(config, ZPOOL_CONFIG_VDEV_TREE,

diff --git a/cmd/zpool/zpool_vdev.c b/cmd/zpool/zpool_vdev.c
index 587aa7fd4861f027faaa1e0d289410a9bc179fe9..3f419079ce4a0a5e174bd5eaa1700c5bcef974eb 100644 (file)
--- a/cmd/zpool/zpool_vdev.c
+++ b/cmd/zpool/zpool_vdev.c
@@ -1522,8 +1522,13 @@ construct_spec(nvlist_t *props, int argc, char **argv)
                                if (child == NULL)
                                        zpool_no_memory();
                                if ((nv = make_leaf_vdev(props, argv[c],
-                                   B_FALSE)) == NULL)
+                                   B_FALSE)) == NULL) {
+                                       for (c = 0; c < children - 1; c++)
+                                               nvlist_free(child[c]);
+                                       free(child);
                                        return (NULL);
+                               }
+
                                child[children - 1] = nv;
                        }
 
@@ -1531,6 +1536,9 @@ construct_spec(nvlist_t *props, int argc, char **argv)
                                (void) fprintf(stderr, gettext("invalid vdev "
                                    "specification: %s requires at least %d "
                                    "devices\n"), argv[0], mindev);
+                               for (c = 0; c < children; c++)
+                                       nvlist_free(child[c]);
+                               free(child);
                                return (NULL);
                        }
 
@@ -1538,6 +1546,9 @@ construct_spec(nvlist_t *props, int argc, char **argv)
                                (void) fprintf(stderr, gettext("invalid vdev "
                                    "specification: %s supports no more than "
                                    "%d devices\n"), argv[0], maxdev);
+                               for (c = 0; c < children; c++)
+                                       nvlist_free(child[c]);
+                               free(child);
                                return (NULL);
                        }
 

diff --git a/lib/libefi/rdwr_efi.c b/lib/libefi/rdwr_efi.c
index 7a7a4b4b73d0642a13e6b4d2cc124d931dc68e42..e9fb15ee2a6e7144fafd6a44050161958a933e74 100644 (file)
--- a/lib/libefi/rdwr_efi.c
+++ b/lib/libefi/rdwr_efi.c
@@ -1106,7 +1106,7 @@ check_input(struct dk_gpt *vtoc)
 int
 efi_use_whole_disk(int fd)
 {
-       struct dk_gpt           *efi_label;
+       struct dk_gpt           *efi_label = NULL;
        int                     rval;
        int                     i;
        uint_t                  resv_index = 0, data_index = 0;
@@ -1115,6 +1115,8 @@ efi_use_whole_disk(int fd)
 
        rval = efi_alloc_and_read(fd, &efi_label);
        if (rval < 0) {
+               if (efi_label != NULL)
+                       efi_free(efi_label);
                return (rval);
        }
 

diff --git a/lib/libuutil/uu_misc.c b/lib/libuutil/uu_misc.c
index 67f757c905a0fc50dfeccfcee4fa309239c38daa..b10afd8eadf19ae6dc48cc3ea3d67487840ba1bb 100644 (file)
--- a/lib/libuutil/uu_misc.c
+++ b/lib/libuutil/uu_misc.c
@@ -199,6 +199,8 @@ uu_panic(const char *format, ...)
 
        (void) vfprintf(stderr, format, args);
 
+       va_end(args);
+
        if (uu_panic_thread == pthread_self())
                abort();
        else

diff --git a/lib/libzfs/libzfs_import.c b/lib/libzfs/libzfs_import.c
index 99c3d9998f2327ffd883c4300e7ad6b7896eb776..2a56205fd60130136037728db4db0b8d946386f3 100644 (file)
--- a/lib/libzfs/libzfs_import.c
+++ b/lib/libzfs/libzfs_import.c
@@ -1551,6 +1551,7 @@ check_slices(avl_tree_t *r, int fd, const char *sname)
        int i;
 
        (void) strncpy(diskname, sname, MAXNAMELEN);
+       diskname[MAXNAMELEN - 1] = '\0';
        if ((ptr = strrchr(diskname, 's')) == NULL || !isdigit(ptr[1]))
                return;
        ptr[1] = '\0';

diff --git a/lib/libzfs/libzfs_sendrecv.c b/lib/libzfs/libzfs_sendrecv.c
index b38a2e544090948fb07aec7525767afdd4f75d09..bc8bd5f8a8bcc46d0736b20754d0edd643377974 100644 (file)
--- a/lib/libzfs/libzfs_sendrecv.c
+++ b/lib/libzfs/libzfs_sendrecv.c
@@ -3264,8 +3264,9 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap,
                 * specified only the pool name (i.e. if the destination name
                 * contained no slash character).
                 */
-               if (!stream_wantsnewfs ||
-                   (cp = strrchr(name, '/')) == NULL) {
+               cp = strrchr(name, '/');
+
+               if (!stream_wantsnewfs || cp == NULL) {
                        zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
                            "destination '%s' does not exist"), name);
                        err = zfs_error(hdl, EZFS_NOENT, errbuf);

diff --git a/module/icp/io/sha2_mod.c b/module/icp/io/sha2_mod.c
index 4466fcff00613054938d0da1372f1ae26420906f..fc5f9604442e72c80d1a5af535dcf59fbdf0e248 100644 (file)
--- a/module/icp/io/sha2_mod.c
+++ b/module/icp/io/sha2_mod.c
@@ -681,7 +681,7 @@ sha2_mac_init_ctx(sha2_hmac_ctx_t *ctx, void *keyval, uint_t length_in_bytes)
 {
        uint64_t ipad[SHA256_HMAC_BLOCK_SIZE / sizeof (uint64_t)];
        uint64_t opad[SHA256_HMAC_BLOCK_SIZE / sizeof (uint64_t)];
-       int i, block_size, blocks_per_int64;
+       int i, block_size, blocks_per_int64 = 0;
 
        /* Determine the block size */
        if (ctx->hc_mech_type <= SHA256_HMAC_GEN_MECH_INFO_TYPE) {

diff --git a/tests/zfs-tests/cmd/file_write/file_write.c b/tests/zfs-tests/cmd/file_write/file_write.c
index 43fd96ac465a122c357395d4003b53c32e2d42ce..046794820589a35d3fc33f81e9d47829bd02fc54 100644 (file)
--- a/tests/zfs-tests/cmd/file_write/file_write.c
+++ b/tests/zfs-tests/cmd/file_write/file_write.c
@@ -127,7 +127,10 @@ main(int argc, char **argv)
                err++;
        }
 
-       if (err) usage(prog);
+       if (err) {
+               usage(prog); /* no return */
+               return (1);
+       }
 
        /*
         * Prepare the buffer and determine the requested operation

diff --git a/tests/zfs-tests/cmd/randfree_file/randfree_file.c b/tests/zfs-tests/cmd/randfree_file/randfree_file.c
index 8e7487c41e779e60e69e73dbf8937261c5ce12db..ff30c24c09dc8ecee050160b3a6a14256114697a 100644 (file)
--- a/tests/zfs-tests/cmd/randfree_file/randfree_file.c
+++ b/tests/zfs-tests/cmd/randfree_file/randfree_file.c
@@ -83,23 +83,26 @@ main(int argc, char *argv[])
        else
                usage(argv[0]);
 
-       buf = (char *)malloc(filesize);
-
        if ((fd = open(filename, O_RDWR | O_CREAT | O_TRUNC, mode)) < 0) {
                perror("open");
                return (1);
        }
+
+       buf = (char *)malloc(filesize);
+
        if (write(fd, buf, filesize) < filesize) {
+               free(buf);
                perror("write");
                return (1);
        }
 
+       free(buf);
+
        if (fallocate(fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
            start_off, off_len) < 0) {
                perror("fallocate");
                return (1);
        }
 
-       free(buf);
        return (0);
 }