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

Fix: Array bounds read in zprop_print_one_property() 

If the loop index i comes to (ZFS_GET_NCOLS - 1), the cbp->cb_columns[i + 1]
actually read the data of cbp->cb_colwidths[0], which means the array
subscript is above array bounds.

Luckily the cbp->cb_colwidths[0] is always 0 and it seems we haven't
looped enough times to exceed the array bounds so far, but it's really
a secluded risk someday.

Signed-off-by: GeLiXin <ge.lixin@zte.com.cn>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #5003
This commit is contained in:
GeLiXin 2016-08-22 11:20:22 +08:00 committed by Ned Bass
parent e66b546cb7
commit e5c02cbb03
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libzfs/libzfs_util.c Normal file → Executable file
View File

@ -1352,7 +1352,8 @@ zprop_print_one_property(const char *name, zprop_get_cbdata_t *cbp,
continue; continue;
} }
if (cbp->cb_columns[i + 1] == GET_COL_NONE) if (i == (ZFS_GET_NCOLS - 1) ||
cbp->cb_columns[i + 1] == GET_COL_NONE)
(void) printf("%s", str); (void) printf("%s", str);
else if (cbp->cb_scripted) else if (cbp->cb_scripted)
(void) printf("%s\t", str); (void) printf("%s\t", str);