svn commit: r331392 - stable/11/cddl/contrib/opensolaris/lib/libzfs/common

[Alexander Motin]

Author: mav
Date: Thu Mar 22 23:51:39 2018
New Revision: 331392
URL: https://svnweb.freebsd.org/changeset/base/331392

Log:
  MFC r329665: MFV r316901:
  7730 libzfs`add_config() leaks config nvl when reading spare/l2cache devices
  
  illumos/illumos-gate at 105686550ee9cbf5d033166a8a2a5a763667d436
  https://github.com/illumos/illumos-gate/commit/105686550ee9cbf5d033166a8a2a5a763667d436
  
  https://www.illumos.org/issues/7730
    antares:root:~# mdb /usr/sbin/zpool
    > ::sysbp _exit
    > ::run import
       pool: data
         id: 2093977168778024605
      state: ONLINE
     action: The pool can be imported using its name or numeric identifier.
     config:
  
            data        ONLINE
              c6t0d0    ONLINE
              c6t1d0    ONLINE
            cache
              c6t2d0
    mdb: stop on entry to _exit
    mdb: target stopped at:
    0xfee556ba:     nop
    mdb: You've got symbols!
    Loading modules: [ ld.so.1 libumem.so.1 libc.so.1 libtopo.so.1 libavl.so.1
    libnvpair.so.1 ]
    > ::findleaks -d
    BYTES             LEAKED VMEM_SEG CALLER
    4096                  10 fda7b000 MMAP
    8192                   1 fea8d000 MMAP
    8192                   1 fe76d000 MMAP
    8192                   1 fe66e000 MMAP
    4096                   1 fe570000 MMAP
    8192                   1 fe470000 MMAP
    4096                   1 fe372000 MMAP
    4096                   1 fe273000 MMAP
  
  Reviewed by: Matthew Ahrens <mahrens at delphix.com>
  Reviewed by: Serapheim Dimitropoulos <serapheim at delphix.com>
  Approved by: Robert Mustacchi <rm at joyent.com>
  Author: Yuri Pankov <yuri.pankov at nexenta.com>

Modified:
  stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
==============================================================================
--- stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c	Thu Mar 22 23:50:43 2018	(r331391)
+++ stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c	Thu Mar 22 23:51:39 2018	(r331392)
@@ -240,9 +240,12 @@ add_config(libzfs_handle_t *hdl, pool_list_t *pl, cons
 			free(ne);
 			return (-1);
 		}
+
 		ne->ne_guid = vdev_guid;
 		ne->ne_next = pl->names;
 		pl->names = ne;
+
+		nvlist_free(config);
 		return (0);
 	}