Author: pluknet
Date: Tue Jan 24 10:32:02 2012
New Revision: 230498
URL: http://svn.freebsd.org/changeset/base/230498

Log:
  MFC r230256:
   Fix the "lock &zrl->zr_mtx already initialized" assertion by initializing
   the allocated memory before calling mtx_init(9) on mtx pointing to it.
   Otherwize, random contents of uninitialized memory might occasionally
   trigger the assertion.
  
   Reported by:  Pavel Polyakov <bsd kobyla org>
   Reviewed by:  pjd

Modified:
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
==============================================================================
--- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c     Tue Jan 
24 10:28:19 2012        (r230497)
+++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c     Tue Jan 
24 10:32:02 2012        (r230498)
@@ -1077,7 +1077,7 @@ dnode_hold_impl(objset_t *os, uint64_t o
        if (children_dnodes == NULL) {
                int i;
                dnode_children_t *winner;
-               children_dnodes = kmem_alloc(sizeof (dnode_children_t) +
+               children_dnodes = kmem_zalloc(sizeof (dnode_children_t) +
                    (epb - 1) * sizeof (dnode_handle_t), KM_SLEEP);
                children_dnodes->dnc_count = epb;
                dnh = &children_dnodes->dnc_children[0];
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to