svn commit: r316695 - head/cddl/contrib/opensolaris/lib/libzfs/common

[Pedro F. Giffuni]

Author: pfg
Date: Mon Apr 10 22:56:38 2017
New Revision: 316695
URL: https://svnweb.freebsd.org/changeset/base/316695

Log:
  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 at delphix.com>
  Reviewed by: Paul Dagnelie <pcd at delphix.com>
  Approved by: Robert Mustacchi <rm at joyent.com>
  Author:	Pedro Giffuni <pfg at freebsd.org>
  
  MFC after:	3 days

Modified:
  head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_fru.c
Directory Properties:
  head/cddl/contrib/opensolaris/   (props changed)
  head/cddl/contrib/opensolaris/lib/libzfs/   (props changed)

Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_fru.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_fru.c	Mon Apr 10 22:47:18 2017	(r316694)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_fru.c	Mon Apr 10 22:56:38 2017	(r316695)
@@ -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;
 
 	/*