c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-10-26 18:05:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix coverity defects: CID 147443, 147656, 147655, 147441, 147653

Browse Source 
coverity scan CID:147443, Type: Buffer not null terminated
coverity scan CID:147656, Type: Copy into fixed size buffer
coverity scan CID:147655, Type: Copy into fixed size buffer
coverity scan CID:147441, Type: Buffer not null terminated
coverity scan CID:147653, Type: Copy into fixed size buffer

Reviewed-by: Richard Laager <rlaager@wiktel.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: liuhuang <liu.huang@zte.com.cn>
Closes #5165
This commit is contained in:
BearBabyLiu 2016-09-30 04:33:09 +08:00 committed by Brian Behlendorf
parent e8ac4557af
commit 0b78aeae92
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/zfs/zfs_main.c
View File

@ -6768,7 +6768,7 @@ zfs_do_bookmark(int argc, char **argv)
* Snapshot name begins with @. * Snapshot name begins with @.
* Default to same fs as bookmark. * Default to same fs as bookmark.
*/ */
(void) strncpy(snapname, argv[1], sizeof (snapname)); (void) strlcpy(snapname, argv[1], sizeof (snapname));
*strchr(snapname, '#') = '\0'; *strchr(snapname, '#') = '\0';
(void) strlcat(snapname, argv[0], sizeof (snapname)); (void) strlcat(snapname, argv[0], sizeof (snapname));
} else { } else {

2
cmd/zinject/zinject.c
View File

@ -548,7 +548,7 @@ register_handler(const char *pool, int flags, zinject_record_t *record,
{ {
zfs_cmd_t zc = {"\0"}; zfs_cmd_t zc = {"\0"};
(void) strcpy(zc.zc_name, pool); (void) strlcpy(zc.zc_name, pool, sizeof (zc.zc_name));
zc.zc_inject_record = *record; zc.zc_inject_record = *record;
zc.zc_guid = flags; zc.zc_guid = flags;

3
lib/libzfs/libzfs_changelist.c
View File

@ -304,7 +304,8 @@ changelist_rename(prop_changelist_t *clp, const char *src, const char *dst)
remove_mountpoint(cn->cn_handle); remove_mountpoint(cn->cn_handle);
(void) strlcpy(newname, dst, sizeof (newname)); (void) strlcpy(newname, dst, sizeof (newname));
(void) strcat(newname, cn->cn_handle->zfs_name + strlen(src)); (void) strlcat(newname, cn->cn_handle->zfs_name + strlen(src),
sizeof (newname));
(void) strlcpy(cn->cn_handle->zfs_name, newname, (void) strlcpy(cn->cn_handle->zfs_name, newname,
sizeof (cn->cn_handle->zfs_name)); sizeof (cn->cn_handle->zfs_name));

2
lib/libzfs/libzfs_diff.c
View File

@ -425,7 +425,7 @@ differ(void *arg)
if ((ofp = fdopen(di->outputfd, "w")) == NULL) { if ((ofp = fdopen(di->outputfd, "w")) == NULL) {
di->zerr = errno; di->zerr = errno;
strncpy(di->errbuf, strerror(errno), sizeof (di->errbuf)); strlcpy(di->errbuf, strerror(errno), sizeof (di->errbuf));
(void) close(di->datafd); (void) close(di->datafd);
return ((void *)-1); return ((void *)-1);
} }

4
lib/libzfs/libzfs_util.c
View File

@ -1107,8 +1107,8 @@ zfs_strcmp_pathname(char *name, char *cmp, int wholedisk)
dup = strdup(cmp); dup = strdup(cmp);
dir = strtok(dup, "/"); dir = strtok(dup, "/");
while (dir) { while (dir) {
strcat(cmp_name, "/"); strlcat(cmp_name, "/", sizeof (cmp_name));
strcat(cmp_name, dir); strlcat(cmp_name, dir, sizeof (cmp_name));
dir = strtok(NULL, "/"); dir = strtok(NULL, "/");
} }
free(dup); free(dup);