Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Fix coverity defects: CID 147639 

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 <behlendorf1@llnl.gov>
Signed-off-by: GeLiXin <ge.lixin@zte.com.cn>
Closes #5198
This commit is contained in:
GeLiXin 2016-10-11 06:30:22 +08:00 committed by Brian Behlendorf
parent d33931a83a
commit 8c8cf8a2d8
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/zpool/zpool_vdev.c
View File

@ -536,19 +536,19 @@ is_whole_disk(const char *path)
* (minus the slice number). * (minus the slice number).
*/ */
static int 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) struct stat64 *statbuf, boolean_t *wholedisk)
{ {
int error; int error;
error = zfs_resolve_shortname(arg, path, MAXPATHLEN); error = zfs_resolve_shortname(arg, path, path_size);
if (error == 0) { if (error == 0) {
*wholedisk = is_whole_disk(path); *wholedisk = is_whole_disk(path);
if (*wholedisk || (stat64(path, statbuf) == 0)) if (*wholedisk || (stat64(path, statbuf) == 0))
return (0); return (0);
} }
strlcpy(path, arg, sizeof (path)); strlcpy(path, arg, path_size);
memset(statbuf, 0, sizeof (*statbuf)); memset(statbuf, 0, sizeof (*statbuf));
*wholedisk = B_FALSE; *wholedisk = B_FALSE;
@ -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 */ /* After is_whole_disk() check restore original passed path */
strlcpy(path, arg, MAXPATHLEN); strlcpy(path, arg, sizeof (path));
} else { } else {
err = is_shorthand_path(arg, path, &statbuf, &wholedisk); err = is_shorthand_path(arg, path, sizeof (path),
&statbuf, &wholedisk);
if (err != 0) { if (err != 0) {
/* /*
* If we got ENOENT, then the user gave us * If we got ENOENT, then the user gave us