Date: Sat, 15 Jul 2017 21:40:48 +0000 (UTC) From: Rick Macklem <rmacklem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r321037 - projects/pnfs-planb-server-stable11/sys/fs/nfsserver Message-ID: <201707152140.v6FLemLt072358@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rmacklem Date: Sat Jul 15 21:40:48 2017 New Revision: 321037 URL: https://svnweb.freebsd.org/changeset/base/321037 Log: Fix a crash that can occur when the DS subdirectories aren't available. Modified: projects/pnfs-planb-server-stable11/sys/fs/nfsserver/nfs_nfsdstate.c Modified: projects/pnfs-planb-server-stable11/sys/fs/nfsserver/nfs_nfsdstate.c ============================================================================== --- projects/pnfs-planb-server-stable11/sys/fs/nfsserver/nfs_nfsdstate.c Sat Jul 15 21:19:27 2017 (r321036) +++ projects/pnfs-planb-server-stable11/sys/fs/nfsserver/nfs_nfsdstate.c Sat Jul 15 21:40:48 2017 (r321037) @@ -6599,7 +6599,8 @@ nfsrv_freedevid(struct nfsdevice *ds) TAILQ_REMOVE(&nfsrv_devidhead, ds, nfsdev_list); vrele(ds->nfsdev_dvp); for (i = 0; i < nfsrv_dsdirsize; i++) - vrele(ds->nfsdev_dsdir[i]); + if (ds->nfsdev_dsdir[i] != NULL) + vrele(ds->nfsdev_dsdir[i]); free(ds->nfsdev_fileaddr, M_NFSDSTATE); free(ds->nfsdev_host, M_NFSDSTATE); free(ds, M_NFSDSTATE);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707152140.v6FLemLt072358>