1
From: Tony Jones <tonyj@suse.de>
2
Subject: Pass struct vfsmount to the inode_unlink 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 | 5 +++--
16
5 files changed, 16 insertions(+), 9 deletions(-)
20
@@ -2324,7 +2324,7 @@ int vfs_unlink(struct inode *dir, struct
21
if (d_mountpoint(dentry))
24
- error = security_inode_unlink(dir, dentry);
25
+ error = security_inode_unlink(dir, dentry, mnt);
27
error = dir->i_op->unlink(dir, dentry);
29
--- a/include/linux/security.h
30
+++ b/include/linux/security.h
31
@@ -356,6 +356,7 @@ static inline void security_free_mnt_opt
32
* Check the permission to remove a hard link to a file.
33
* @dir contains the inode structure of parent directory of the file.
34
* @dentry contains the dentry structure for file to be unlinked.
35
+ * @mnt is the vfsmount corresponding to @dentry (may be NULL).
36
* Return 0 if permission is granted.
38
* Check the permission to create a symbolic link to a file.
39
@@ -1369,7 +1370,8 @@ struct security_operations {
40
int (*inode_link) (struct dentry *old_dentry, struct vfsmount *old_mnt,
41
struct inode *dir, struct dentry *new_dentry,
42
struct vfsmount *new_mnt);
43
- int (*inode_unlink) (struct inode *dir, struct dentry *dentry);
44
+ int (*inode_unlink) (struct inode *dir, struct dentry *dentry,
45
+ struct vfsmount *mnt);
46
int (*inode_symlink) (struct inode *dir, struct dentry *dentry,
47
struct vfsmount *mnt, const char *old_name);
48
int (*inode_mkdir) (struct inode *dir, struct dentry *dentry,
49
@@ -1646,7 +1648,8 @@ int security_inode_create(struct inode *
50
int security_inode_link(struct dentry *old_dentry, struct vfsmount *old_mnt,
51
struct inode *dir, struct dentry *new_dentry,
52
struct vfsmount *new_mnt);
53
-int security_inode_unlink(struct inode *dir, struct dentry *dentry);
54
+int security_inode_unlink(struct inode *dir, struct dentry *dentry,
55
+ struct vfsmount *mnt);
56
int security_inode_symlink(struct inode *dir, struct dentry *dentry,
57
struct vfsmount *mnt, const char *old_name);
58
int security_inode_mkdir(struct inode *dir, struct dentry *dentry,
59
@@ -2003,7 +2006,8 @@ static inline int security_inode_link(st
62
static inline int security_inode_unlink(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
@@ -302,7 +302,8 @@ static int dummy_inode_link (struct dent
75
-static int dummy_inode_unlink (struct inode *inode, struct dentry *dentry)
76
+static int dummy_inode_unlink (struct inode *inode, struct dentry *dentry,
77
+ struct vfsmount *mnt)
81
--- a/security/security.c
82
+++ b/security/security.c
83
@@ -406,11 +406,12 @@ int security_inode_link(struct dentry *o
87
-int security_inode_unlink(struct inode *dir, struct dentry *dentry)
88
+int security_inode_unlink(struct inode *dir, struct dentry *dentry,
89
+ struct vfsmount *mnt)
91
if (unlikely(IS_PRIVATE(dentry->d_inode)))
93
- return security_ops->inode_unlink(dir, dentry);
94
+ return security_ops->inode_unlink(dir, dentry, mnt);
97
int security_inode_symlink(struct inode *dir, struct dentry *dentry,
98
--- a/security/selinux/hooks.c
99
+++ b/security/selinux/hooks.c
100
@@ -2528,11 +2528,12 @@ static int selinux_inode_link(struct den
101
return may_link(dir, old_dentry, MAY_LINK);
104
-static int selinux_inode_unlink(struct inode *dir, struct dentry *dentry)
105
+static int selinux_inode_unlink(struct inode *dir, struct dentry *dentry,
106
+ struct vfsmount *mnt)
110
- rc = secondary_ops->inode_unlink(dir, dentry);
111
+ rc = secondary_ops->inode_unlink(dir, dentry, mnt);
114
return may_link(dir, dentry, MAY_UNLINK);