Commit 8e04fdfa authored Jul 17, 2019 by Trond Myklebust

pnfs/flexfiles: Fix PTR_ERR() dereferences in ff_layout_track_ds_error



mirror->mirror_ds can be NULL if uninitialised, but can contain
a PTR_ERR() if call to GETDEVICEINFO failed.

Fixes: 65990d1a ("pNFS/flexfiles: Fix a deadlock on LAYOUTGET")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Cc: stable@vger.kernel.org # 4.10+

parent d9aba2b4

fs/nfs/flexfilelayout/flexfilelayoutdev.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -257,7 +257,7 @@ int ff_layout_track_ds_error(struct nfs4_flexfile_layout *flo,
		if (status == 0)
		return 0;

		if (mirror->mirror_ds == NULL)
		if (IS_ERR_OR_NULL(mirror->mirror_ds))
		return -EINVAL;

		dserr = kmalloc(sizeof(*dserr), gfp_flags);

Admin message