On Wed, Mar 11, 2020 at 12:13 AM J. Hannken-Illjes <hann...@eis.cs.tu-bs.de> wrote:
> On 10. Mar 2020, at 13:37, Santhosh Raju <f...@netbsd.org> wrote: > > On Tue, Mar 10, 2020 at 7:25 AM Santhosh Raju <f...@netbsd.org> wrote: > > > Module Name: src > Committed By: fox > Date: Mon Mar 9 15:40:50 UTC 2020 > > Modified Files: > src/external/cddl/osnet/dist/uts/common/fs/zfs: metaslab.c > > Log Message: > external/cddl/osnet: Fix possible null pointer access. > > Detected by UBSan and fixed upstream, pick only the fix from the commit. > > Cherry-pick: > From 928e8ad47d3478a3d5d01f0dd6ae74a9371af65e Mon Sep 17 00:00:00 2001 > From: Serapheim Dimitropoulos <seraphe...@gmail.com> > Date: Wed, 20 Feb 2019 09:59:57 -0800 > Subject: [PATCH] Introduce auxiliary metaslab histograms > > Reviewed by: Paul Dagnelie <p...@delphix.com> > Reviewed-by: Brian Behlendorf <behlendo...@llnl.gov> > Reviewed by: Matt Ahrens <mahr...@delphix.com> > Signed-off-by: Serapheim Dimitropoulos <seraph...@delphix.com> > Closes #8358 > > Reviewed by: kamil@ > > > To generate a diff of this commit: > cvs rdiff -u -r1.1.1.3 -r1.2 \ > src/external/cddl/osnet/dist/uts/common/fs/zfs/metaslab.c > > Please note that diffs are not public domain; they are subject to the > copyright notices on the relevant files. > > > Forgot to add in the commit log, the changes have been pulled in from > upstream openzfs. > > > https://github.com/openzfs/zfs/commit/928e8ad47d3478a3d5d01f0dd6ae74a9371af65e#diff-9fd6b453f8153161abe0728c449e6505R4386 > > -- > Santhosh > > > This is NOT our upstream -- > Regardless of NetBSD's "official" upstream, this is the new OpenZFS upstream. It has moved off illumos earlier in the year to ZoL which was restructured to be cross platform. It includes FreeBSD support, though that flavor of ZFS hasn't been completely merged back into FreeBSD just yet (there's work in progress to make that happen). Since it's the only real upstream today, you may need to do some updates to cope with the new ZFS playing field. Warner
