diff options
| -rw-r--r-- | fs/namei.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/namei.c b/fs/namei.c index a005d8b7afad..8c3580610eec 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
| @@ -435,7 +435,7 @@ static int exec_permission_lite(struct inode *inode) | |||
| 435 | umode_t mode = inode->i_mode; | 435 | umode_t mode = inode->i_mode; |
| 436 | 436 | ||
| 437 | if (inode->i_op->permission) | 437 | if (inode->i_op->permission) |
| 438 | return -EAGAIN; | 438 | return inode_permission(inode, MAY_EXEC); |
| 439 | 439 | ||
| 440 | if (current_fsuid() == inode->i_uid) | 440 | if (current_fsuid() == inode->i_uid) |
| 441 | mode >>= 6; | 441 | mode >>= 6; |
| @@ -853,9 +853,6 @@ static int __link_path_walk(const char *name, struct nameidata *nd) | |||
| 853 | 853 | ||
| 854 | nd->flags |= LOOKUP_CONTINUE; | 854 | nd->flags |= LOOKUP_CONTINUE; |
| 855 | err = exec_permission_lite(inode); | 855 | err = exec_permission_lite(inode); |
| 856 | if (err == -EAGAIN) | ||
| 857 | err = inode_permission(nd->path.dentry->d_inode, | ||
| 858 | MAY_EXEC); | ||
| 859 | if (err) | 856 | if (err) |
| 860 | break; | 857 | break; |
| 861 | 858 | ||
