Skip to content

Commit

Permalink
lustre: Unsafe error handling around ll_splice_alias
Browse files Browse the repository at this point in the history
Callers of ll_splice_alias() should not assign the returned pointer to
the dentry since it can be an err pointer. Fixed the above bug using a
temporary dentry pointer. This temporary pointer is assigned to dentry
only if ll_splice_alias has not returned an err pointer.

Signed-off-by: Swapnil Pimpale <spimpale@ddn.com>
Reviewed-on: http://review.whamcloud.com/7460
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3807
Reviewed-by: Fan Yong <fan.yong@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Swapnil Pimpale authored and Greg Kroah-Hartman committed Feb 11, 2014
1 parent f34b6cd commit 7486bc0
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
9 changes: 6 additions & 3 deletions drivers/staging/lustre/lustre/llite/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -462,9 +462,12 @@ int ll_lookup_it_finish(struct ptlrpc_request *request,
* Atoimc_open may passin hashed dentries for open.
*/
if (d_unhashed(*de)) {
*de = ll_splice_alias(inode, *de);
if (IS_ERR(*de))
return PTR_ERR(*de);
struct dentry *alias;

alias = ll_splice_alias(inode, *de);
if (IS_ERR(alias))
return PTR_ERR(alias);
*de = alias;
}

if (!it_disposition(it, DISP_LOOKUP_NEG)) {
Expand Down
9 changes: 6 additions & 3 deletions drivers/staging/lustre/lustre/llite/statahead.c
Original file line number Diff line number Diff line change
Expand Up @@ -1585,12 +1585,15 @@ int do_statahead_enter(struct inode *dir, struct dentry **dentryp,
ll_inode2fid(inode), &bits);
if (rc == 1) {
if ((*dentryp)->d_inode == NULL) {
*dentryp = ll_splice_alias(inode,
struct dentry *alias;

alias = ll_splice_alias(inode,
*dentryp);
if (IS_ERR(*dentryp)) {
if (IS_ERR(alias)) {
ll_sai_unplug(sai, entry);
return PTR_ERR(*dentryp);
return PTR_ERR(alias);
}
*dentryp = alias;
} else if ((*dentryp)->d_inode != inode) {
/* revalidate, but inode is recreated */
CDEBUG(D_READA,
Expand Down

0 comments on commit 7486bc0

Please sign in to comment.