svn commit: r366590 - in stable/12: stand/libsa/zfs usr.bin/netstat

[Allan Jude]

Author: allanjude
Date: Fri Oct  9 22:42:04 2020
New Revision: 366590
URL: https://svnweb.freebsd.org/changeset/base/366590

Log:
  MFC r364787:
  
  ZFS: whitelist zstd and encryption in the loader
  
  Please note that neither zstd nor encryption is
  supported by the loader at this instant. This
  change makes it safe to use those features in
  one's root pool, but not in one's root dataset.

Modified:
  stable/12/stand/libsa/zfs/zfsimpl.c
  stable/12/usr.bin/netstat/route.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/stand/libsa/zfs/zfsimpl.c
==============================================================================
--- stable/12/stand/libsa/zfs/zfsimpl.c	Fri Oct  9 22:23:39 2020	(r366589)
+++ stable/12/stand/libsa/zfs/zfsimpl.c	Fri Oct  9 22:42:04 2020	(r366590)
@@ -127,6 +127,8 @@ static const char *features_for_read[] = {
 	"com.delphix:device_removal",
 	"com.delphix:obsolete_counts",
 	"com.intel:allocation_classes",
+	"org.freebsd:zstd_compress",
+	"com.datto:encryption",
 	NULL
 };
 

Modified: stable/12/usr.bin/netstat/route.c
==============================================================================
--- stable/12/usr.bin/netstat/route.c	Fri Oct  9 22:23:39 2020	(r366589)
+++ stable/12/usr.bin/netstat/route.c	Fri Oct  9 22:42:04 2020	(r366590)
@@ -772,12 +772,7 @@ rt_stats(void)
 		xo_emit("{W:rtstat: symbol not in namelist}\n");
 		return;
 	}
-	if ((rttaddr = nl[N_RTTRASH].n_value) == 0) {
-		xo_emit("{W:rttrash: symbol not in namelist}\n");
-		return;
-	}
 	kread(rtsaddr, (char *)&rtstat, sizeof (rtstat));
-	kread(rttaddr, (char *)&rttrash, sizeof (rttrash));
 	xo_emit("{T:routing}:\n");
 
 #define	p(f, m) if (rtstat.f || sflag <= 1) \
@@ -793,7 +788,17 @@ rt_stats(void)
 	    "{N:/destination%s found unreachable}\n");
 	p(rts_wildcard, "\t{:wildcard-uses/%hu} "
 	    "{N:/use%s of a wildcard route}\n");
+	p(rts_nh_idx_alloc_failure, "\t{:nexthop-index-alloc-failures/%hu} "
+	    "{N:/nexthop index alloc failure%s}\n");
+	p(rts_nh_alloc_failure, "\t{:nexthop-alloc-failures/%hu} "
+	    "{N:/nexthop allocation failure%s}\n");
 #undef p
+
+	if ((rttaddr = nl[N_RTTRASH].n_value) == 0) {
+		xo_emit("{W:rttrash: symbol not in namelist}\n");
+		return;
+	}
+	kread(rttaddr, (char *)&rttrash, sizeof (rttrash));
 
 	if (rttrash || sflag <= 1)
 		xo_emit("\t{:unused-but-not-freed/%u} "