From 0aeefca396bf27b43a9dfd604c5f6b80f3959f40 Mon Sep 17 00:00:00 2001 From: pfg Date: Thu, 13 Apr 2017 15:40:57 +0000 Subject: [PATCH] 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 Reviewed by: Paul Dagnelie Approved by: Robert Mustacchi Author: Pedro Giffuni git-svn-id: svn://svn.freebsd.org/base/stable/10@316763 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- cddl/contrib/opensolaris/lib/libzfs/common/libzfs_fru.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_fru.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_fru.c index 788fa2cfb..474470c41 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; /* -- 2.45.0