Author: mav
Date: Mon Apr 16 03:42:47 2018
New Revision: 332533
URL: https://svnweb.freebsd.org/changeset/base/332533

Log:
  MFC r329775: MFV r329774:
  8408 dsl_props_set_sync_impl() does not handle nested nvlists correctly
  
  illumos/illumos-gate@85723e5eec42f46dbfdb4c09b9e1ed66501d1ccf
  
  When iterating over the input nvlist in dsl_props_set_sync_impl() when we
  don't preserve the nvpair name before looking up ZPROP_VALUE, so when we
  later go to process it nvpair_name() is always "value" instead of the actual
  property name.
  
  This results in a couple of bugs in the recv code:
  
   - received properties are not restored correctly when failing to receive
     an incremental send stream
   - received properties are not completely replaced by the new ones when
     successfully receiving an incremental send stream
  
  This was discovered on ZFS on Linux (fixed in
  
https://github.com/zfsonlinux/zfs/commit/5f1346c29997dd4e02acf4c19c875d5484f33b1e)
  
  Reviewed by: Paul Dagnelie <p...@delphix.com>
  Reviewed by: Matthew Ahrens <mahr...@delphix.com>
  Approved by: Dan McDonald <dan...@joyent.com>
  Author: loli10K <ezomori.noz...@gmail.com>

Modified:
  stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c Mon Apr 
16 03:42:06 2018        (r332532)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c Mon Apr 
16 03:42:47 2018        (r332533)
@@ -856,11 +856,15 @@ dsl_props_set_sync_impl(dsl_dataset_t *ds, zprop_sourc
 
        while ((elem = nvlist_next_nvpair(props, elem)) != NULL) {
                nvpair_t *pair = elem;
+               const char *name = nvpair_name(pair);
 
                if (nvpair_type(pair) == DATA_TYPE_NVLIST) {
                        /*
-                        * dsl_prop_get_all_impl() returns properties in this
-                        * format.
+                        * This usually happens when we reuse the nvlist_t data
+                        * returned by the counterpart dsl_prop_get_all_impl().
+                        * For instance we do this to restore the original
+                        * received properties when an error occurs in the
+                        * zfs_ioc_recv() codepath.
                         */
                        nvlist_t *attrs = fnvpair_value_nvlist(pair);
                        pair = fnvlist_lookup_nvpair(attrs, ZPROP_VALUE);
@@ -868,14 +872,14 @@ dsl_props_set_sync_impl(dsl_dataset_t *ds, zprop_sourc
 
                if (nvpair_type(pair) == DATA_TYPE_STRING) {
                        const char *value = fnvpair_value_string(pair);
-                       dsl_prop_set_sync_impl(ds, nvpair_name(pair),
+                       dsl_prop_set_sync_impl(ds, name,
                            source, 1, strlen(value) + 1, value, tx);
                } else if (nvpair_type(pair) == DATA_TYPE_UINT64) {
                        uint64_t intval = fnvpair_value_uint64(pair);
-                       dsl_prop_set_sync_impl(ds, nvpair_name(pair),
+                       dsl_prop_set_sync_impl(ds, name,
                            source, sizeof (intval), 1, &intval, tx);
                } else if (nvpair_type(pair) == DATA_TYPE_BOOLEAN) {
-                       dsl_prop_set_sync_impl(ds, nvpair_name(pair),
+                       dsl_prop_set_sync_impl(ds, name,
                            source, 0, 0, NULL, tx);
                } else {
                        panic("invalid nvpair type");
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to