1
From: Tony Jones <tonyj@suse.de>
2
Subject: Pass struct vfsmount to the inode_rmdir LSM hook
4
This is needed for computing pathnames in the AppArmor LSM.
6
Signed-off-by: Tony Jones <tonyj@suse.de>
7
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
8
Signed-off-by: John Johansen <jjohansen@suse.de>
12
include/linux/security.h | 10 +++++++---
13
security/dummy.c | 3 ++-
14
security/security.c | 5 +++--
15
security/selinux/hooks.c | 3 ++-
16
5 files changed, 15 insertions(+), 8 deletions(-)
20
@@ -2104,7 +2104,7 @@ int vfs_rmdir(struct inode *dir, struct
21
if (d_mountpoint(dentry))
24
- error = security_inode_rmdir(dir, dentry);
25
+ error = security_inode_rmdir(dir, dentry, mnt);
27
error = dir->i_op->rmdir(dir, dentry);
29
--- a/include/linux/security.h
30
+++ b/include/linux/security.h
31
@@ -332,6 +332,7 @@ struct request_sock;
32
* Check the permission to remove a directory.
33
* @dir contains the inode structure of parent of the directory to be removed.
34
* @dentry contains the dentry structure of directory to be removed.
35
+ * @mnt is the vfsmount corresponding to @dentry (may be NULL).
36
* Return 0 if permission is granted.
38
* Check permissions when creating a special file (or a socket or a fifo
39
@@ -1265,7 +1266,8 @@ struct security_operations {
40
struct vfsmount *mnt, const char *old_name);
41
int (*inode_mkdir) (struct inode *dir, struct dentry *dentry,
42
struct vfsmount *mnt, int mode);
43
- int (*inode_rmdir) (struct inode *dir, struct dentry *dentry);
44
+ int (*inode_rmdir) (struct inode *dir, struct dentry *dentry,
45
+ struct vfsmount *mnt);
46
int (*inode_mknod) (struct inode *dir, struct dentry *dentry,
47
struct vfsmount *mnt, int mode, dev_t dev);
48
int (*inode_rename) (struct inode *old_dir, struct dentry *old_dentry,
49
@@ -1524,7 +1526,8 @@ int security_inode_symlink(struct inode
50
struct vfsmount *mnt, const char *old_name);
51
int security_inode_mkdir(struct inode *dir, struct dentry *dentry,
52
struct vfsmount *mnt, int mode);
53
-int security_inode_rmdir(struct inode *dir, struct dentry *dentry);
54
+int security_inode_rmdir(struct inode *dir, struct dentry *dentry,
55
+ struct vfsmount *mnt);
56
int security_inode_mknod(struct inode *dir, struct dentry *dentry,
57
struct vfsmount *mnt, int mode, dev_t dev);
58
int security_inode_rename(struct inode *old_dir, struct dentry *old_dentry,
59
@@ -1867,7 +1870,8 @@ static inline int security_inode_mkdir (
62
static inline int security_inode_rmdir (struct inode *dir,
63
- struct dentry *dentry)
64
+ struct dentry *dentry,
65
+ struct vfsmount *mnt)
69
--- a/security/dummy.c
70
+++ b/security/dummy.c
71
@@ -292,7 +292,8 @@ static int dummy_inode_mkdir (struct ino
75
-static int dummy_inode_rmdir (struct inode *inode, struct dentry *dentry)
76
+static int dummy_inode_rmdir (struct inode *inode, struct dentry *dentry,
77
+ struct vfsmount *mnt)
81
--- a/security/security.c
82
+++ b/security/security.c
83
@@ -369,11 +369,12 @@ int security_inode_mkdir(struct inode *d
84
return security_ops->inode_mkdir(dir, dentry, mnt, mode);
87
-int security_inode_rmdir(struct inode *dir, struct dentry *dentry)
88
+int security_inode_rmdir(struct inode *dir, struct dentry *dentry,
89
+ struct vfsmount *mnt)
91
if (unlikely(IS_PRIVATE(dentry->d_inode)))
93
- return security_ops->inode_rmdir(dir, dentry);
94
+ return security_ops->inode_rmdir(dir, dentry, mnt);
97
int security_inode_mknod(struct inode *dir, struct dentry *dentry,
98
--- a/security/selinux/hooks.c
99
+++ b/security/selinux/hooks.c
100
@@ -2227,7 +2227,8 @@ static int selinux_inode_mkdir(struct in
101
return may_create(dir, dentry, SECCLASS_DIR);
104
-static int selinux_inode_rmdir(struct inode *dir, struct dentry *dentry)
105
+static int selinux_inode_rmdir(struct inode *dir, struct dentry *dentry,
106
+ struct vfsmount *mnt)
108
return may_link(dir, dentry, MAY_RMDIR);