diff options
| author | pfg <pfg@FreeBSD.org> | 2017-04-13 15:39:42 +0000 |
|---|---|---|
| committer | pfg <pfg@FreeBSD.org> | 2017-04-13 15:39:42 +0000 |
| commit | 12762cefa0c27ee82745463e55d31a16409dacde (patch) | |
| tree | b7637fac6e854f3667dc1a4782edc277a0618aad /cddl | |
| parent | 853152d60fdc6fb0fa20ef31e13ee1e25f947840 (diff) | |
| download | FreeBSD-src-12762cefa0c27ee82745463e55d31a16409dacde.zip FreeBSD-src-12762cefa0c27ee82745463e55d31a16409dacde.tar.gz | |
MFC r316695, MFV r316693:
8046 Let calloc() do the multiplication in libzfs_fru_refresh
https://github.com/illumos/illumos-gate/commit/5697e03e6e3e2697f56ae341c7c8ce79680d6a2e
https://www.illumos.org/issues/8046
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Paul Dagnelie <pcd@delphix.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Author: Pedro Giffuni <pfg@freebsd.org>
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libzfs/common/libzfs_fru.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_fru.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_fru.c index 788fa2c..474470c 100644 --- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_fru.c +++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_fru.c @@ -282,7 +282,7 @@ libzfs_fru_refresh(libzfs_handle_t *hdl) if (hdl->libzfs_fru_hash == NULL && (hdl->libzfs_fru_hash = - calloc(ZFS_FRU_HASH_SIZE * sizeof (void *), 1)) == NULL) + calloc(ZFS_FRU_HASH_SIZE, sizeof (void *))) == NULL) return; /* |
