mirror of
https://gitlab.com/apparmor/apparmor.git
synced 2025-03-07 01:41:00 +01:00
110 lines
3.7 KiB
Diff
110 lines
3.7 KiB
Diff
From: Tony Jones <tonyj@suse.de>
|
|
Subject: Pass struct vfsmount to the inode_getxattr LSM hook
|
|
|
|
This is needed for computing pathnames in the AppArmor LSM.
|
|
|
|
Signed-off-by: Tony Jones <tonyj@suse.de>
|
|
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
|
|
Signed-off-by: John Johansen <jjohansen@suse.de>
|
|
|
|
---
|
|
fs/xattr.c | 2 +-
|
|
include/linux/security.h | 11 +++++++----
|
|
security/dummy.c | 3 ++-
|
|
security/security.c | 5 +++--
|
|
security/selinux/hooks.c | 3 ++-
|
|
5 files changed, 15 insertions(+), 9 deletions(-)
|
|
|
|
--- a/fs/xattr.c
|
|
+++ b/fs/xattr.c
|
|
@@ -141,7 +141,7 @@ vfs_getxattr(struct dentry *dentry, stru
|
|
if (error)
|
|
return error;
|
|
|
|
- error = security_inode_getxattr(dentry, name);
|
|
+ error = security_inode_getxattr(dentry, mnt, name);
|
|
if (error)
|
|
return error;
|
|
|
|
--- a/include/linux/security.h
|
|
+++ b/include/linux/security.h
|
|
@@ -450,7 +450,7 @@ static inline void security_free_mnt_opt
|
|
* @value identified by @name for @dentry and @mnt.
|
|
* @inode_getxattr:
|
|
* Check permission before obtaining the extended attributes
|
|
- * identified by @name for @dentry.
|
|
+ * identified by @name for @dentry and @mnt.
|
|
* Return 0 if permission is granted.
|
|
* @inode_listxattr:
|
|
* Check permission before obtaining the list of extended attribute
|
|
@@ -1401,7 +1401,8 @@ struct security_operations {
|
|
struct vfsmount *mnt,
|
|
const char *name, const void *value,
|
|
size_t size, int flags);
|
|
- int (*inode_getxattr) (struct dentry *dentry, const char *name);
|
|
+ int (*inode_getxattr) (struct dentry *dentry, struct vfsmount *mnt,
|
|
+ const char *name);
|
|
int (*inode_listxattr) (struct dentry *dentry);
|
|
int (*inode_removexattr) (struct dentry *dentry, const char *name);
|
|
int (*inode_need_killpriv) (struct dentry *dentry);
|
|
@@ -1682,7 +1683,8 @@ int security_inode_setxattr(struct dentr
|
|
void security_inode_post_setxattr(struct dentry *dentry, struct vfsmount *mnt,
|
|
const char *name, const void *value,
|
|
size_t size, int flags);
|
|
-int security_inode_getxattr(struct dentry *dentry, const char *name);
|
|
+int security_inode_getxattr(struct dentry *dentry, struct vfsmount *mnt,
|
|
+ const char *name);
|
|
int security_inode_listxattr(struct dentry *dentry);
|
|
int security_inode_removexattr(struct dentry *dentry, const char *name);
|
|
int security_inode_need_killpriv(struct dentry *dentry);
|
|
@@ -2114,7 +2116,8 @@ static inline void security_inode_post_s
|
|
{ }
|
|
|
|
static inline int security_inode_getxattr(struct dentry *dentry,
|
|
- const char *name)
|
|
+ struct vfsmount *mnt,
|
|
+ const char *name)
|
|
{
|
|
return 0;
|
|
}
|
|
--- a/security/dummy.c
|
|
+++ b/security/dummy.c
|
|
@@ -392,7 +392,8 @@ static void dummy_inode_post_setxattr (s
|
|
{
|
|
}
|
|
|
|
-static int dummy_inode_getxattr (struct dentry *dentry, const char *name)
|
|
+static int dummy_inode_getxattr (struct dentry *dentry, struct vfsmount *mnt,
|
|
+ const char *name)
|
|
{
|
|
return 0;
|
|
}
|
|
--- a/security/security.c
|
|
+++ b/security/security.c
|
|
@@ -520,11 +520,12 @@ void security_inode_post_setxattr(struct
|
|
flags);
|
|
}
|
|
|
|
-int security_inode_getxattr(struct dentry *dentry, const char *name)
|
|
+int security_inode_getxattr(struct dentry *dentry, struct vfsmount *mnt,
|
|
+ const char *name)
|
|
{
|
|
if (unlikely(IS_PRIVATE(dentry->d_inode)))
|
|
return 0;
|
|
- return security_ops->inode_getxattr(dentry, name);
|
|
+ return security_ops->inode_getxattr(dentry, mnt, name);
|
|
}
|
|
|
|
int security_inode_listxattr(struct dentry *dentry)
|
|
--- a/security/selinux/hooks.c
|
|
+++ b/security/selinux/hooks.c
|
|
@@ -2732,7 +2732,8 @@ static void selinux_inode_post_setxattr(
|
|
return;
|
|
}
|
|
|
|
-static int selinux_inode_getxattr(struct dentry *dentry, const char *name)
|
|
+static int selinux_inode_getxattr(struct dentry *dentry, struct vfsmount *mnt,
|
|
+ const char *name)
|
|
{
|
|
return dentry_has_perm(current, NULL, dentry, FILE__GETATTR);
|
|
}
|