Fix coverity defects
1.coverity scan CID:147445 function zfs_do_send in zfs_main.c Buffer not null terminated (BUFFER_SIZE_WARNING) 2.coverity scan CID:147443 function zfs_do_bookmark in zfs_main.c Buffer not null terminated (BUFFER_SIZE_WARNING) 3.coverity scan CID:147660 function main in zinject.c Passing string argv[0] of unknown size to strcpy By the way, the leak of g_zfs is fixed. 4.coverity scan CID: 147442 function make_disks in zpool_vdev.c Buffer not null terminated (BUFFER_SIZE_WARNING) 5.coverity scan CID: 147661 function main in dir_rd_update.c passing string cp1 of unknown size to strcpy Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: luozhengzheng <luo.zhengzheng@zte.com.cn> Closes #5130
This commit is contained in:
parent
3ec68a4414
commit
5df39c1e43
|
@ -3865,7 +3865,7 @@ zfs_do_send(int argc, char **argv)
|
||||||
* Incremental source name begins with # or @.
|
* Incremental source name begins with # or @.
|
||||||
* Default to same fs as target.
|
* Default to same fs as target.
|
||||||
*/
|
*/
|
||||||
(void) strncpy(frombuf, argv[0], sizeof (frombuf));
|
(void) strlcpy(frombuf, argv[0], sizeof (frombuf));
|
||||||
cp = strchr(frombuf, '@');
|
cp = strchr(frombuf, '@');
|
||||||
if (cp != NULL)
|
if (cp != NULL)
|
||||||
*cp = '\0';
|
*cp = '\0';
|
||||||
|
@ -6771,7 +6771,7 @@ zfs_do_bookmark(int argc, char **argv)
|
||||||
*strchr(snapname, '#') = '\0';
|
*strchr(snapname, '#') = '\0';
|
||||||
(void) strlcat(snapname, argv[0], sizeof (snapname));
|
(void) strlcat(snapname, argv[0], sizeof (snapname));
|
||||||
} else {
|
} else {
|
||||||
(void) strncpy(snapname, argv[0], sizeof (snapname));
|
(void) strlcpy(snapname, argv[0], sizeof (snapname));
|
||||||
}
|
}
|
||||||
zhp = zfs_open(g_zfs, snapname, ZFS_TYPE_SNAPSHOT);
|
zhp = zfs_open(g_zfs, snapname, ZFS_TYPE_SNAPSHOT);
|
||||||
if (zhp == NULL)
|
if (zhp == NULL)
|
||||||
|
|
|
@ -681,6 +681,7 @@ main(int argc, char **argv)
|
||||||
|
|
||||||
if ((zfs_fd = open(ZFS_DEV, O_RDWR)) < 0) {
|
if ((zfs_fd = open(ZFS_DEV, O_RDWR)) < 0) {
|
||||||
(void) fprintf(stderr, "failed to open ZFS device\n");
|
(void) fprintf(stderr, "failed to open ZFS device\n");
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (1);
|
return (1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -695,7 +696,7 @@ main(int argc, char **argv)
|
||||||
(void) printf("Run 'zinject -h' for usage "
|
(void) printf("Run 'zinject -h' for usage "
|
||||||
"information.\n");
|
"information.\n");
|
||||||
}
|
}
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -714,6 +715,7 @@ main(int argc, char **argv)
|
||||||
(void) fprintf(stderr, "invalid action '%s': "
|
(void) fprintf(stderr, "invalid action '%s': "
|
||||||
"must be 'degrade' or 'fault'\n", optarg);
|
"must be 'degrade' or 'fault'\n", optarg);
|
||||||
usage();
|
usage();
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (1);
|
return (1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -735,6 +737,7 @@ main(int argc, char **argv)
|
||||||
(void) fprintf(stderr, "invalid i/o delay "
|
(void) fprintf(stderr, "invalid i/o delay "
|
||||||
"value: '%s'\n", optarg);
|
"value: '%s'\n", optarg);
|
||||||
usage();
|
usage();
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (1);
|
return (1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -752,6 +755,7 @@ main(int argc, char **argv)
|
||||||
"'%s': must be 'io', 'checksum' or "
|
"'%s': must be 'io', 'checksum' or "
|
||||||
"'nxio'\n", optarg);
|
"'nxio'\n", optarg);
|
||||||
usage();
|
usage();
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (1);
|
return (1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -760,6 +764,7 @@ main(int argc, char **argv)
|
||||||
if (record.zi_freq < 1 || record.zi_freq > 100) {
|
if (record.zi_freq < 1 || record.zi_freq > 100) {
|
||||||
(void) fprintf(stderr, "frequency range must "
|
(void) fprintf(stderr, "frequency range must "
|
||||||
"be in the range (0, 100]\n");
|
"be in the range (0, 100]\n");
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (1);
|
return (1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -773,6 +778,7 @@ main(int argc, char **argv)
|
||||||
(void) fprintf(stderr, "invalid duration '%s': "
|
(void) fprintf(stderr, "invalid duration '%s': "
|
||||||
"must be a positive integer\n", optarg);
|
"must be a positive integer\n", optarg);
|
||||||
usage();
|
usage();
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (1);
|
return (1);
|
||||||
}
|
}
|
||||||
/* store duration of txgs as its negative */
|
/* store duration of txgs as its negative */
|
||||||
|
@ -780,6 +786,7 @@ main(int argc, char **argv)
|
||||||
break;
|
break;
|
||||||
case 'h':
|
case 'h':
|
||||||
usage();
|
usage();
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (0);
|
return (0);
|
||||||
case 'I':
|
case 'I':
|
||||||
/* default duration, if one hasn't yet been defined */
|
/* default duration, if one hasn't yet been defined */
|
||||||
|
@ -793,6 +800,7 @@ main(int argc, char **argv)
|
||||||
(void) fprintf(stderr, "invalid level '%s': "
|
(void) fprintf(stderr, "invalid level '%s': "
|
||||||
"must be an integer\n", optarg);
|
"must be an integer\n", optarg);
|
||||||
usage();
|
usage();
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (1);
|
return (1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -817,6 +825,7 @@ main(int argc, char **argv)
|
||||||
(void) fprintf(stderr, "invalid duration '%s': "
|
(void) fprintf(stderr, "invalid duration '%s': "
|
||||||
"must be a positive integer\n", optarg);
|
"must be a positive integer\n", optarg);
|
||||||
usage();
|
usage();
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (1);
|
return (1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -836,6 +845,7 @@ main(int argc, char **argv)
|
||||||
"'%s': must be 'read', 'write', 'free', "
|
"'%s': must be 'read', 'write', 'free', "
|
||||||
"'claim' or 'all'\n", optarg);
|
"'claim' or 'all'\n", optarg);
|
||||||
usage();
|
usage();
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (1);
|
return (1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -845,6 +855,7 @@ main(int argc, char **argv)
|
||||||
(void) fprintf(stderr, "invalid type '%s'\n",
|
(void) fprintf(stderr, "invalid type '%s'\n",
|
||||||
optarg);
|
optarg);
|
||||||
usage();
|
usage();
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (1);
|
return (1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -857,6 +868,7 @@ main(int argc, char **argv)
|
||||||
(void) fprintf(stderr, "invalid label type "
|
(void) fprintf(stderr, "invalid label type "
|
||||||
"'%s'\n", optarg);
|
"'%s'\n", optarg);
|
||||||
usage();
|
usage();
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (1);
|
return (1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -864,11 +876,13 @@ main(int argc, char **argv)
|
||||||
(void) fprintf(stderr, "option -%c requires an "
|
(void) fprintf(stderr, "option -%c requires an "
|
||||||
"operand\n", optopt);
|
"operand\n", optopt);
|
||||||
usage();
|
usage();
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (1);
|
return (1);
|
||||||
case '?':
|
case '?':
|
||||||
(void) fprintf(stderr, "invalid option '%c'\n",
|
(void) fprintf(stderr, "invalid option '%c'\n",
|
||||||
optopt);
|
optopt);
|
||||||
usage();
|
usage();
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (2);
|
return (2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -888,11 +902,13 @@ main(int argc, char **argv)
|
||||||
(void) fprintf(stderr, "cancel (-c) incompatible with "
|
(void) fprintf(stderr, "cancel (-c) incompatible with "
|
||||||
"any other options\n");
|
"any other options\n");
|
||||||
usage();
|
usage();
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (2);
|
return (2);
|
||||||
}
|
}
|
||||||
if (argc != 0) {
|
if (argc != 0) {
|
||||||
(void) fprintf(stderr, "extraneous argument to '-c'\n");
|
(void) fprintf(stderr, "extraneous argument to '-c'\n");
|
||||||
usage();
|
usage();
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (2);
|
return (2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -904,6 +920,7 @@ main(int argc, char **argv)
|
||||||
(void) fprintf(stderr, "invalid handle id '%s':"
|
(void) fprintf(stderr, "invalid handle id '%s':"
|
||||||
" must be an integer or 'all'\n", cancel);
|
" must be an integer or 'all'\n", cancel);
|
||||||
usage();
|
usage();
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (1);
|
return (1);
|
||||||
}
|
}
|
||||||
return (cancel_handler(id));
|
return (cancel_handler(id));
|
||||||
|
@ -920,6 +937,7 @@ main(int argc, char **argv)
|
||||||
(void) fprintf(stderr, "device (-d) incompatible with "
|
(void) fprintf(stderr, "device (-d) incompatible with "
|
||||||
"data error injection\n");
|
"data error injection\n");
|
||||||
usage();
|
usage();
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (2);
|
return (2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -927,21 +945,25 @@ main(int argc, char **argv)
|
||||||
(void) fprintf(stderr, "device (-d) injection requires "
|
(void) fprintf(stderr, "device (-d) injection requires "
|
||||||
"a single pool name\n");
|
"a single pool name\n");
|
||||||
usage();
|
usage();
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (2);
|
return (2);
|
||||||
}
|
}
|
||||||
|
|
||||||
(void) strcpy(pool, argv[0]);
|
(void) strlcpy(pool, argv[0], sizeof (pool));
|
||||||
dataset[0] = '\0';
|
dataset[0] = '\0';
|
||||||
|
|
||||||
if (error == ECKSUM) {
|
if (error == ECKSUM) {
|
||||||
(void) fprintf(stderr, "device error type must be "
|
(void) fprintf(stderr, "device error type must be "
|
||||||
"'io' or 'nxio'\n");
|
"'io' or 'nxio'\n");
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (1);
|
return (1);
|
||||||
}
|
}
|
||||||
|
|
||||||
record.zi_iotype = io_type;
|
record.zi_iotype = io_type;
|
||||||
if (translate_device(pool, device, label, &record) != 0)
|
if (translate_device(pool, device, label, &record) != 0) {
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (1);
|
return (1);
|
||||||
|
}
|
||||||
if (!error)
|
if (!error)
|
||||||
error = ENXIO;
|
error = ENXIO;
|
||||||
|
|
||||||
|
@ -954,6 +976,7 @@ main(int argc, char **argv)
|
||||||
(void) fprintf(stderr, "raw (-b) format with "
|
(void) fprintf(stderr, "raw (-b) format with "
|
||||||
"any other options\n");
|
"any other options\n");
|
||||||
usage();
|
usage();
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (2);
|
return (2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -961,21 +984,25 @@ main(int argc, char **argv)
|
||||||
(void) fprintf(stderr, "raw (-b) format expects a "
|
(void) fprintf(stderr, "raw (-b) format expects a "
|
||||||
"single pool name\n");
|
"single pool name\n");
|
||||||
usage();
|
usage();
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (2);
|
return (2);
|
||||||
}
|
}
|
||||||
|
|
||||||
(void) strcpy(pool, argv[0]);
|
(void) strlcpy(pool, argv[0], sizeof (pool));
|
||||||
dataset[0] = '\0';
|
dataset[0] = '\0';
|
||||||
|
|
||||||
if (error == ENXIO) {
|
if (error == ENXIO) {
|
||||||
(void) fprintf(stderr, "data error type must be "
|
(void) fprintf(stderr, "data error type must be "
|
||||||
"'checksum' or 'io'\n");
|
"'checksum' or 'io'\n");
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (1);
|
return (1);
|
||||||
}
|
}
|
||||||
|
|
||||||
record.zi_cmd = ZINJECT_DATA_FAULT;
|
record.zi_cmd = ZINJECT_DATA_FAULT;
|
||||||
if (translate_raw(raw, &record) != 0)
|
if (translate_raw(raw, &record) != 0) {
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (1);
|
return (1);
|
||||||
|
}
|
||||||
if (!error)
|
if (!error)
|
||||||
error = EIO;
|
error = EIO;
|
||||||
} else if (record.zi_cmd == ZINJECT_PANIC) {
|
} else if (record.zi_cmd == ZINJECT_PANIC) {
|
||||||
|
@ -984,6 +1011,7 @@ main(int argc, char **argv)
|
||||||
(void) fprintf(stderr, "panic (-p) incompatible with "
|
(void) fprintf(stderr, "panic (-p) incompatible with "
|
||||||
"other options\n");
|
"other options\n");
|
||||||
usage();
|
usage();
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (2);
|
return (2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -991,10 +1019,11 @@ main(int argc, char **argv)
|
||||||
(void) fprintf(stderr, "panic (-p) injection requires "
|
(void) fprintf(stderr, "panic (-p) injection requires "
|
||||||
"a single pool name and an optional id\n");
|
"a single pool name and an optional id\n");
|
||||||
usage();
|
usage();
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (2);
|
return (2);
|
||||||
}
|
}
|
||||||
|
|
||||||
(void) strcpy(pool, argv[0]);
|
(void) strlcpy(pool, argv[0], sizeof (pool));
|
||||||
if (argv[1] != NULL)
|
if (argv[1] != NULL)
|
||||||
record.zi_type = atoi(argv[1]);
|
record.zi_type = atoi(argv[1]);
|
||||||
dataset[0] = '\0';
|
dataset[0] = '\0';
|
||||||
|
@ -1003,21 +1032,24 @@ main(int argc, char **argv)
|
||||||
(void) fprintf(stderr, "-s or -g meaningless "
|
(void) fprintf(stderr, "-s or -g meaningless "
|
||||||
"without -I (ignore writes)\n");
|
"without -I (ignore writes)\n");
|
||||||
usage();
|
usage();
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (2);
|
return (2);
|
||||||
} else if (dur_secs && dur_txg) {
|
} else if (dur_secs && dur_txg) {
|
||||||
(void) fprintf(stderr, "choose a duration either "
|
(void) fprintf(stderr, "choose a duration either "
|
||||||
"in seconds (-s) or a number of txgs (-g) "
|
"in seconds (-s) or a number of txgs (-g) "
|
||||||
"but not both\n");
|
"but not both\n");
|
||||||
usage();
|
usage();
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (2);
|
return (2);
|
||||||
} else if (argc != 1) {
|
} else if (argc != 1) {
|
||||||
(void) fprintf(stderr, "ignore writes (-I) "
|
(void) fprintf(stderr, "ignore writes (-I) "
|
||||||
"injection requires a single pool name\n");
|
"injection requires a single pool name\n");
|
||||||
usage();
|
usage();
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (2);
|
return (2);
|
||||||
}
|
}
|
||||||
|
|
||||||
(void) strcpy(pool, argv[0]);
|
(void) strlcpy(pool, argv[0], sizeof (pool));
|
||||||
dataset[0] = '\0';
|
dataset[0] = '\0';
|
||||||
} else if (type == TYPE_INVAL) {
|
} else if (type == TYPE_INVAL) {
|
||||||
if (flags == 0) {
|
if (flags == 0) {
|
||||||
|
@ -1025,16 +1057,18 @@ main(int argc, char **argv)
|
||||||
"'-t', '-a', '-p', '-I' or '-u' "
|
"'-t', '-a', '-p', '-I' or '-u' "
|
||||||
"must be specified\n");
|
"must be specified\n");
|
||||||
usage();
|
usage();
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (2);
|
return (2);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (argc == 1 && (flags & ZINJECT_UNLOAD_SPA)) {
|
if (argc == 1 && (flags & ZINJECT_UNLOAD_SPA)) {
|
||||||
(void) strcpy(pool, argv[0]);
|
(void) strlcpy(pool, argv[0], sizeof (pool));
|
||||||
dataset[0] = '\0';
|
dataset[0] = '\0';
|
||||||
} else if (argc != 0) {
|
} else if (argc != 0) {
|
||||||
(void) fprintf(stderr, "extraneous argument for "
|
(void) fprintf(stderr, "extraneous argument for "
|
||||||
"'-f'\n");
|
"'-f'\n");
|
||||||
usage();
|
usage();
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (2);
|
return (2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1043,19 +1077,23 @@ main(int argc, char **argv)
|
||||||
if (argc != 1) {
|
if (argc != 1) {
|
||||||
(void) fprintf(stderr, "missing object\n");
|
(void) fprintf(stderr, "missing object\n");
|
||||||
usage();
|
usage();
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (2);
|
return (2);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (error == ENXIO) {
|
if (error == ENXIO) {
|
||||||
(void) fprintf(stderr, "data error type must be "
|
(void) fprintf(stderr, "data error type must be "
|
||||||
"'checksum' or 'io'\n");
|
"'checksum' or 'io'\n");
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (1);
|
return (1);
|
||||||
}
|
}
|
||||||
|
|
||||||
record.zi_cmd = ZINJECT_DATA_FAULT;
|
record.zi_cmd = ZINJECT_DATA_FAULT;
|
||||||
if (translate_record(type, argv[0], range, level, &record, pool,
|
if (translate_record(type, argv[0], range, level, &record, pool,
|
||||||
dataset) != 0)
|
dataset) != 0) {
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (1);
|
return (1);
|
||||||
|
}
|
||||||
if (!error)
|
if (!error)
|
||||||
error = EIO;
|
error = EIO;
|
||||||
}
|
}
|
||||||
|
@ -1066,10 +1104,15 @@ main(int argc, char **argv)
|
||||||
* time we access the pool.
|
* time we access the pool.
|
||||||
*/
|
*/
|
||||||
if (dataset[0] != '\0' && domount) {
|
if (dataset[0] != '\0' && domount) {
|
||||||
if ((zhp = zfs_open(g_zfs, dataset, ZFS_TYPE_DATASET)) == NULL)
|
if ((zhp = zfs_open(g_zfs, dataset,
|
||||||
|
ZFS_TYPE_DATASET)) == NULL) {
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (1);
|
return (1);
|
||||||
if (zfs_unmount(zhp, NULL, 0) != 0)
|
}
|
||||||
|
if (zfs_unmount(zhp, NULL, 0) != 0) {
|
||||||
|
libzfs_fini(g_zfs);
|
||||||
return (1);
|
return (1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
record.zi_error = error;
|
record.zi_error = error;
|
||||||
|
|
|
@ -1199,7 +1199,7 @@ make_disks(zpool_handle_t *zhp, nvlist_t *nv)
|
||||||
* window between when udev deletes and recreates the link
|
* window between when udev deletes and recreates the link
|
||||||
* during which access attempts will fail with ENOENT.
|
* during which access attempts will fail with ENOENT.
|
||||||
*/
|
*/
|
||||||
strncpy(udevpath, path, MAXPATHLEN);
|
strlcpy(udevpath, path, MAXPATHLEN);
|
||||||
(void) zfs_append_partition(udevpath, MAXPATHLEN);
|
(void) zfs_append_partition(udevpath, MAXPATHLEN);
|
||||||
|
|
||||||
fd = open(devpath, O_RDWR|O_EXCL);
|
fd = open(devpath, O_RDWR|O_EXCL);
|
||||||
|
|
|
@ -63,6 +63,11 @@ main(int argc, char **argv)
|
||||||
}
|
}
|
||||||
|
|
||||||
cp1 = argv[1];
|
cp1 = argv[1];
|
||||||
|
if (strlen(cp1) >= (sizeof (dirpath) - strlen("TMP_DIR"))) {
|
||||||
|
(void) printf("The string length of mount point is "
|
||||||
|
"too large\n");
|
||||||
|
exit(-1);
|
||||||
|
}
|
||||||
(void) strcpy(&dirpath[0], (const char *)cp1);
|
(void) strcpy(&dirpath[0], (const char *)cp1);
|
||||||
(void) strcat(&dirpath[strlen(dirpath)], "TMP_DIR");
|
(void) strcat(&dirpath[strlen(dirpath)], "TMP_DIR");
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue