diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fs.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 5419df70a835..55cc0a319baa 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
| @@ -2259,6 +2259,7 @@ extern int notify_change(struct dentry *, struct iattr *, struct inode **); | |||
| 2259 | extern int inode_permission(struct inode *, int); | 2259 | extern int inode_permission(struct inode *, int); |
| 2260 | extern int __inode_permission(struct inode *, int); | 2260 | extern int __inode_permission(struct inode *, int); |
| 2261 | extern int generic_permission(struct inode *, int); | 2261 | extern int generic_permission(struct inode *, int); |
| 2262 | extern int __check_sticky(struct inode *dir, struct inode *inode); | ||
| 2262 | 2263 | ||
| 2263 | static inline bool execute_ok(struct inode *inode) | 2264 | static inline bool execute_ok(struct inode *inode) |
| 2264 | { | 2265 | { |
| @@ -2745,6 +2746,14 @@ static inline int is_sxid(umode_t mode) | |||
| 2745 | return (mode & S_ISUID) || ((mode & S_ISGID) && (mode & S_IXGRP)); | 2746 | return (mode & S_ISUID) || ((mode & S_ISGID) && (mode & S_IXGRP)); |
| 2746 | } | 2747 | } |
| 2747 | 2748 | ||
| 2749 | static inline int check_sticky(struct inode *dir, struct inode *inode) | ||
| 2750 | { | ||
| 2751 | if (!(dir->i_mode & S_ISVTX)) | ||
| 2752 | return 0; | ||
| 2753 | |||
| 2754 | return __check_sticky(dir, inode); | ||
| 2755 | } | ||
| 2756 | |||
| 2748 | static inline void inode_has_no_xattr(struct inode *inode) | 2757 | static inline void inode_has_no_xattr(struct inode *inode) |
| 2749 | { | 2758 | { |
| 2750 | if (!is_sxid(inode->i_mode) && (inode->i_sb->s_flags & MS_NOSEC)) | 2759 | if (!is_sxid(inode->i_mode) && (inode->i_sb->s_flags & MS_NOSEC)) |
