diff options
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/eventpoll.c | 2 | ||||
| -rw-r--r-- | fs/namei.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 1c8b55670804..eedec84c1809 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c | |||
| @@ -1654,8 +1654,8 @@ SYSCALL_DEFINE1(epoll_create1, int, flags) | |||
| 1654 | error = PTR_ERR(file); | 1654 | error = PTR_ERR(file); |
| 1655 | goto out_free_fd; | 1655 | goto out_free_fd; |
| 1656 | } | 1656 | } |
| 1657 | fd_install(fd, file); | ||
| 1658 | ep->file = file; | 1657 | ep->file = file; |
| 1658 | fd_install(fd, file); | ||
| 1659 | return fd; | 1659 | return fd; |
| 1660 | 1660 | ||
| 1661 | out_free_fd: | 1661 | out_free_fd: |
diff --git a/fs/namei.c b/fs/namei.c index db76b866a097..dd1ed1b8e98e 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
| @@ -352,6 +352,7 @@ int __inode_permission(struct inode *inode, int mask) | |||
| 352 | /** | 352 | /** |
| 353 | * sb_permission - Check superblock-level permissions | 353 | * sb_permission - Check superblock-level permissions |
| 354 | * @sb: Superblock of inode to check permission on | 354 | * @sb: Superblock of inode to check permission on |
| 355 | * @inode: Inode to check permission on | ||
| 355 | * @mask: Right to check for (%MAY_READ, %MAY_WRITE, %MAY_EXEC) | 356 | * @mask: Right to check for (%MAY_READ, %MAY_WRITE, %MAY_EXEC) |
| 356 | * | 357 | * |
| 357 | * Separate out file-system wide checks from inode-specific permission checks. | 358 | * Separate out file-system wide checks from inode-specific permission checks. |
| @@ -656,6 +657,7 @@ int sysctl_protected_hardlinks __read_mostly = 1; | |||
| 656 | /** | 657 | /** |
| 657 | * may_follow_link - Check symlink following for unsafe situations | 658 | * may_follow_link - Check symlink following for unsafe situations |
| 658 | * @link: The path of the symlink | 659 | * @link: The path of the symlink |
| 660 | * @nd: nameidata pathwalk data | ||
| 659 | * | 661 | * |
| 660 | * In the case of the sysctl_protected_symlinks sysctl being enabled, | 662 | * In the case of the sysctl_protected_symlinks sysctl being enabled, |
| 661 | * CAP_DAC_OVERRIDE needs to be specifically ignored if the symlink is | 663 | * CAP_DAC_OVERRIDE needs to be specifically ignored if the symlink is |
