From: Miklos Szeredi In the inode_listxattr() security operation and related functions pass the path (vfsmount + dentry) instead of the dentry. AppArmor will need this. Signed-off-by: Miklos Szeredi --- fs/xattr.c | 2 +- include/linux/security.h | 8 ++++---- security/dummy.c | 2 +- security/security.c | 6 +++--- security/selinux/hooks.c | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) Index: linux-2.6/fs/xattr.c =================================================================== --- linux-2.6.orig/fs/xattr.c 2008-05-29 12:20:57.000000000 +0200 +++ linux-2.6/fs/xattr.c 2008-05-29 12:20:58.000000000 +0200 @@ -189,7 +189,7 @@ path_listxattr(struct path *path, char * struct dentry *d = path->dentry; ssize_t error; - error = security_inode_listxattr(d); + error = security_inode_listxattr(path); if (error) return error; error = -EOPNOTSUPP; Index: linux-2.6/include/linux/security.h =================================================================== --- linux-2.6.orig/include/linux/security.h 2008-05-29 12:20:57.000000000 +0200 +++ linux-2.6/include/linux/security.h 2008-05-29 12:20:58.000000000 +0200 @@ -439,7 +439,7 @@ static inline void security_free_mnt_opt * Return 0 if permission is granted. * @inode_listxattr: * Check permission before obtaining the list of extended attribute - * names for @dentry. + * names for @path. * Return 0 if permission is granted. * @inode_removexattr: * Check permission before removing the extended attribute @@ -1376,7 +1376,7 @@ struct security_operations { void (*inode_post_setxattr) (struct dentry *dentry, const char *name, const void *value, size_t size, int flags); int (*inode_getxattr) (struct path *path, const char *name); - int (*inode_listxattr) (struct dentry *dentry); + int (*inode_listxattr) (struct path *path); int (*inode_removexattr) (struct dentry *dentry, const char *name); int (*inode_need_killpriv) (struct dentry *dentry); int (*inode_killpriv) (struct dentry *dentry); @@ -1648,7 +1648,7 @@ int security_inode_setxattr(struct dentr void security_inode_post_setxattr(struct dentry *dentry, const char *name, const void *value, size_t size, int flags); int security_inode_getxattr(struct path *path, const char *name); -int security_inode_listxattr(struct dentry *dentry); +int security_inode_listxattr(struct path *path); int security_inode_removexattr(struct dentry *dentry, const char *name); int security_inode_need_killpriv(struct dentry *dentry); int security_inode_killpriv(struct dentry *dentry); @@ -2063,7 +2063,7 @@ static inline int security_inode_getxatt return 0; } -static inline int security_inode_listxattr(struct dentry *dentry) +static inline int security_inode_listxattr(struct path *path) { return 0; } Index: linux-2.6/security/dummy.c =================================================================== --- linux-2.6.orig/security/dummy.c 2008-05-29 12:20:57.000000000 +0200 +++ linux-2.6/security/dummy.c 2008-05-29 12:20:58.000000000 +0200 @@ -384,7 +384,7 @@ static int dummy_inode_getxattr(struct p return 0; } -static int dummy_inode_listxattr (struct dentry *dentry) +static int dummy_inode_listxattr(struct path *path) { return 0; } Index: linux-2.6/security/security.c =================================================================== --- linux-2.6.orig/security/security.c 2008-05-29 12:20:57.000000000 +0200 +++ linux-2.6/security/security.c 2008-05-29 12:20:58.000000000 +0200 @@ -516,11 +516,11 @@ int security_inode_getxattr(struct path return security_ops->inode_getxattr(path, name); } -int security_inode_listxattr(struct dentry *dentry) +int security_inode_listxattr(struct path *path) { - if (unlikely(IS_PRIVATE(dentry->d_inode))) + if (unlikely(IS_PRIVATE(path->dentry->d_inode))) return 0; - return security_ops->inode_listxattr(dentry); + return security_ops->inode_listxattr(path); } int security_inode_removexattr(struct dentry *dentry, const char *name) Index: linux-2.6/security/selinux/hooks.c =================================================================== --- linux-2.6.orig/security/selinux/hooks.c 2008-05-29 12:20:57.000000000 +0200 +++ linux-2.6/security/selinux/hooks.c 2008-05-29 12:20:58.000000000 +0200 @@ -2702,9 +2702,9 @@ static int selinux_inode_getxattr(struct return dentry_has_perm(current, NULL, path->dentry, FILE__GETATTR); } -static int selinux_inode_listxattr(struct dentry *dentry) +static int selinux_inode_listxattr(struct path *path) { - return dentry_has_perm(current, NULL, dentry, FILE__GETATTR); + return dentry_has_perm(current, NULL, path->dentry, FILE__GETATTR); } static int selinux_inode_removexattr(struct dentry *dentry, const char *name) -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/