Skip to content

Commit

Permalink
Fix coverity defects: CID 147639
Browse files Browse the repository at this point in the history
When array is passed as a parameter it degenerates into a
pointer so the sizeof(path) in is_shorthand_path() and always
get return value of 8, instead of the string length we want.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: GeLiXin <[email protected]>
Closes openzfs#5198
  • Loading branch information
GeLiXin authored and behlendorf committed Oct 10, 2016
1 parent d33931a commit 8c8cf8a
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions cmd/zpool/zpool_vdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -536,19 +536,19 @@ is_whole_disk(const char *path)
* (minus the slice number).
*/
static int
is_shorthand_path(const char *arg, char *path,
is_shorthand_path(const char *arg, char *path, size_t path_size,
struct stat64 *statbuf, boolean_t *wholedisk)
{
int error;

error = zfs_resolve_shortname(arg, path, MAXPATHLEN);
error = zfs_resolve_shortname(arg, path, path_size);
if (error == 0) {
*wholedisk = is_whole_disk(path);
if (*wholedisk || (stat64(path, statbuf) == 0))
return (0);
}

strlcpy(path, arg, sizeof (path));
strlcpy(path, arg, path_size);
memset(statbuf, 0, sizeof (*statbuf));
*wholedisk = B_FALSE;

Expand Down Expand Up @@ -658,9 +658,10 @@ make_leaf_vdev(nvlist_t *props, const char *arg, uint64_t is_log)
}

/* After is_whole_disk() check restore original passed path */
strlcpy(path, arg, MAXPATHLEN);
strlcpy(path, arg, sizeof (path));
} else {
err = is_shorthand_path(arg, path, &statbuf, &wholedisk);
err = is_shorthand_path(arg, path, sizeof (path),
&statbuf, &wholedisk);
if (err != 0) {
/*
* If we got ENOENT, then the user gave us
Expand Down

0 comments on commit 8c8cf8a

Please sign in to comment.