evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lustre: Unsafe error handling around ll_splice_alias

Browse source 
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>
This commit is contained in:
Swapnil Pimpale 2014-02-09 02:51:46 -05:00 • committed by Greg Kroah-Hartman
parent f34b6cd3ee
commit 7486bc06ab
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/staging/lustre/lustre/llite/namei.c
View file

@ -462,9 +462,12 @@ int ll_lookup_it_finish(struct ptlrpc_request *request,
* Atoimc_open may passin hashed dentries for open. * Atoimc_open may passin hashed dentries for open.
*/ */
if (d_unhashed(*de)) { if (d_unhashed(*de)) {
*de = ll_splice_alias(inode, *de); struct dentry *alias;
if (IS_ERR(*de))
return PTR_ERR(*de); alias = ll_splice_alias(inode, *de);
if (IS_ERR(alias))
return PTR_ERR(alias);
*de = alias;
} }
if (!it_disposition(it, DISP_LOOKUP_NEG)) { if (!it_disposition(it, DISP_LOOKUP_NEG)) {

9
drivers/staging/lustre/lustre/llite/statahead.c
View file

@ -1585,12 +1585,15 @@ int do_statahead_enter(struct inode *dir, struct dentry **dentryp,
ll_inode2fid(inode), &bits); ll_inode2fid(inode), &bits);
if (rc == 1) { if (rc == 1) {
if ((*dentryp)->d_inode == NULL) { if ((*dentryp)->d_inode == NULL) {
*dentryp = ll_splice_alias(inode, struct dentry *alias;
alias = ll_splice_alias(inode,
*dentryp); *dentryp);
if (IS_ERR(*dentryp)) { if (IS_ERR(alias)) {
ll_sai_unplug(sai, entry); ll_sai_unplug(sai, entry);
return PTR_ERR(*dentryp); return PTR_ERR(alias);
} }
*dentryp = alias;
} else if ((*dentryp)->d_inode != inode) { } else if ((*dentryp)->d_inode != inode) {
/* revalidate, but inode is recreated */ /* revalidate, but inode is recreated */
CDEBUG(D_READA, CDEBUG(D_READA,