diff options
| author | Gvozden Neskovic <[email protected]> | 2016-07-19 18:24:24 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-07-27 13:31:22 -0700 |
| commit | a64f903b06e9135c07f20bc6f8196e2879d2cf57 (patch) | |
| tree | 0e96a7a6c5789b4ca4abc0c287e11a9474275660 /lib | |
| parent | 25458cbef9e59ef9ee6a7e729ab2522ed308f88f (diff) | |
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 <[email protected]>
Signed-off-by: Chunwei Chen <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #1392
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libefi/rdwr_efi.c | 4 | ||||
| -rw-r--r-- | lib/libuutil/uu_misc.c | 2 | ||||
| -rw-r--r-- | lib/libzfs/libzfs_import.c | 1 | ||||
| -rw-r--r-- | lib/libzfs/libzfs_sendrecv.c | 5 |
4 files changed, 9 insertions, 3 deletions
diff --git a/lib/libefi/rdwr_efi.c b/lib/libefi/rdwr_efi.c index 7a7a4b4b7..e9fb15ee2 100644 --- 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 67f757c90..b10afd8ea 100644 --- 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 99c3d9998..2a56205fd 100644 --- 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 b38a2e544..bc8bd5f8a 100644 --- 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); |