Commit 1d6e65be authored by NeilBrown's avatar NeilBrown Committed by Greg Kroah-Hartman

staging: lustre: fix error deref in ll_splice_alias().

d_splice_alias() can return an ERR_PTR().
If it does while debugging is enabled, the following
CDEBUG() will dereference that error and crash.

So add appropriate checking, and provide a separate
debug message for the error case.
Reported-and-tested-by: default avatarJames Simmons <jsimmons@infradead.org>
Fixes: e9d4f0b9 ("staging: lustre: llite: use d_splice_alias for directories.")
Reviewed-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9604c7ac
...@@ -442,9 +442,14 @@ struct dentry *ll_splice_alias(struct inode *inode, struct dentry *de) ...@@ -442,9 +442,14 @@ struct dentry *ll_splice_alias(struct inode *inode, struct dentry *de)
} else { } else {
struct dentry *new = d_splice_alias(inode, de); struct dentry *new = d_splice_alias(inode, de);
if (IS_ERR(new))
CDEBUG(D_DENTRY,
"splice inode %p as %pd gives error %lu\n",
inode, de, PTR_ERR(new));
if (new) if (new)
de = new; de = new;
} }
if (!IS_ERR(de))
CDEBUG(D_DENTRY, "Add dentry %p inode %p refc %d flags %#x\n", CDEBUG(D_DENTRY, "Add dentry %p inode %p refc %d flags %#x\n",
de, d_inode(de), d_count(de), de->d_flags); de, d_inode(de), d_count(de), de->d_flags);
return de; return de;
......
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