Commit 8e04fdfa authored by Trond Myklebust's avatar 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: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Cc: stable@vger.kernel.org # 4.10+
parent d9aba2b4
...@@ -257,7 +257,7 @@ int ff_layout_track_ds_error(struct nfs4_flexfile_layout *flo, ...@@ -257,7 +257,7 @@ int ff_layout_track_ds_error(struct nfs4_flexfile_layout *flo,
if (status == 0) if (status == 0)
return 0; return 0;
if (mirror->mirror_ds == NULL) if (IS_ERR_OR_NULL(mirror->mirror_ds))
return -EINVAL; return -EINVAL;
dserr = kmalloc(sizeof(*dserr), gfp_flags); dserr = kmalloc(sizeof(*dserr), gfp_flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment