d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Illumos #3120 zinject hangs in zfsdev_ioctl() due to uninitialized zc

Browse Source 
3120 zinject hangs in zfsdev_ioctl() due to uninitialized zc

Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Eric Schrock <eric.schrock@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Approved by: Richard Lowe <richlowe@richlowe.net>

References:
  https://www.illumos.org/issues/3120
  illumos/illumos-gate@f4c46b1eda

Ported-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #2152
This commit is contained in:
Yuri Pankov 2014-03-20 15:21:37 -07:00 committed by Brian Behlendorf
parent a15dac42df
commit d3773fda14
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/zinject/zinject.c
View File

@ -295,11 +295,9 @@ static int
iter_handlers(int (*func)(int, const char *, zinject_record_t *, void *), iter_handlers(int (*func)(int, const char *, zinject_record_t *, void *),
void *data) void *data)
{ {
zfs_cmd_t zc; zfs_cmd_t zc = {"\0"};
int ret; int ret;
zc.zc_guid = 0;
while (ioctl(zfs_fd, ZFS_IOC_INJECT_LIST_NEXT, &zc) == 0) while (ioctl(zfs_fd, ZFS_IOC_INJECT_LIST_NEXT, &zc) == 0)
if ((ret = func((int)zc.zc_guid, zc.zc_name, if ((ret = func((int)zc.zc_guid, zc.zc_name,
&zc.zc_inject_record, data)) != 0) &zc.zc_inject_record, data)) != 0)
@ -422,7 +420,7 @@ static int
cancel_one_handler(int id, const char *pool, zinject_record_t *record, cancel_one_handler(int id, const char *pool, zinject_record_t *record,
void *data) void *data)
{ {
zfs_cmd_t zc; zfs_cmd_t zc = {"\0"};
zc.zc_guid = (uint64_t)id; zc.zc_guid = (uint64_t)id;
@ -455,7 +453,7 @@ cancel_all_handlers(void)
static int static int
cancel_handler(int id) cancel_handler(int id)
{ {
zfs_cmd_t zc; zfs_cmd_t zc = {"\0"};
zc.zc_guid = (uint64_t)id; zc.zc_guid = (uint64_t)id;
@ -477,7 +475,7 @@ static int
register_handler(const char *pool, int flags, zinject_record_t *record, register_handler(const char *pool, int flags, zinject_record_t *record,
int quiet) int quiet)
{ {
zfs_cmd_t zc; zfs_cmd_t zc = {"\0"};
(void) strcpy(zc.zc_name, pool); (void) strcpy(zc.zc_name, pool);
zc.zc_inject_record = *record; zc.zc_inject_record = *record;
@ -534,7 +532,7 @@ register_handler(const char *pool, int flags, zinject_record_t *record,
int int
perform_action(const char *pool, zinject_record_t *record, int cmd) perform_action(const char *pool, zinject_record_t *record, int cmd)
{ {
zfs_cmd_t zc; zfs_cmd_t zc = {"\0"};
ASSERT(cmd == VDEV_STATE_DEGRADED || cmd == VDEV_STATE_FAULTED); ASSERT(cmd == VDEV_STATE_DEGRADED || cmd == VDEV_STATE_FAULTED);
(void) strlcpy(zc.zc_name, pool, sizeof (zc.zc_name)); (void) strlcpy(zc.zc_name, pool, sizeof (zc.zc_name));