diff options
| author | Tobin Harding <[email protected]> | 2017-10-17 09:32:48 +1100 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-10-16 15:32:48 -0700 |
| commit | ced28193b06b3d93f404a5d67713c124731a2a0d (patch) | |
| tree | 9e4190db472b596e896dc80ec41220450204b2d6 /cmd/zfs | |
| parent | 7670f721fc82e6cdcdd31f83760a79b6f2f2b998 (diff) | |
Fix coverity defects: 147480, 147584
CID 147480: Logically dead code (DEADCODE)
Remove non-null check and subsequent function call. Add ASSERT to future
proof the code.
usage label is only jumped to before `zhp` is initialized.
CID 147584: Out-of-bounds access (OVERRUN)
Subtract length of current string from buffer length for `size` argument
to `snprintf`.
Starting address for the write is the start of the buffer + the current
string length. We need to subtract this string length else risk a buffer
overflow.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Tobin C. Harding <[email protected]>
Closes #6745
Diffstat (limited to 'cmd/zfs')
| -rw-r--r-- | cmd/zfs/zfs_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c index b9b53f22b..26096e115 100644 --- a/cmd/zfs/zfs_main.c +++ b/cmd/zfs/zfs_main.c @@ -785,8 +785,7 @@ zfs_do_clone(int argc, char **argv) return (!!ret); usage: - if (zhp) - zfs_close(zhp); + ASSERT3P(zhp, ==, NULL); nvlist_free(props); usage(B_FALSE); return (-1); |