mirror of
https://gitlab.com/apparmor/apparmor
synced 2025-09-05 16:55:32 +00:00
92 lines
3.4 KiB
Diff
92 lines
3.4 KiB
Diff
|
Pass struct vfsmount to the inode_symlink LSM hook.
|
||
|
|
|
||
|
|
Signed-off-by: Tony Jones <tonyj@suse.de>
|
||
|
|
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
|
||
|
|
|
||
|
|
Index: linux-2.6.19/fs/namei.c
|
||
|
|
===================================================================
|
||
|
|
--- linux-2.6.19.orig/fs/namei.c
|
||
|
|
+++ linux-2.6.19/fs/namei.c
|
||
|
|
@@ -2200,7 +2200,7 @@ int vfs_symlink(struct inode *dir, struc
|
||
|
|
if (!dir->i_op || !dir->i_op->symlink)
|
||
|
|
return -EPERM;
|
||
|
|
|
||
|
|
- error = security_inode_symlink(dir, dentry, oldname);
|
||
|
|
+ error = security_inode_symlink(dir, mnt, dentry, oldname);
|
||
|
|
if (error)
|
||
|
|
return error;
|
||
|
|
|
||
|
|
Index: linux-2.6.19/include/linux/security.h
|
||
|
|
===================================================================
|
||
|
|
--- linux-2.6.19.orig/include/linux/security.h
|
||
|
|
+++ linux-2.6.19/include/linux/security.h
|
||
|
|
@@ -300,6 +300,7 @@ struct request_sock;
|
||
|
|
* @inode_symlink:
|
||
|
|
* Check the permission to create a symbolic link to a file.
|
||
|
|
* @dir contains the inode structure of parent directory of the symbolic link.
|
||
|
|
+ * @mnt is the vfsmount of the new dentry (may be NULL)
|
||
|
|
* @dentry contains the dentry structure of the symbolic link.
|
||
|
|
* @old_name contains the pathname of file.
|
||
|
|
* Return 0 if permission is granted.
|
||
|
|
@@ -1221,7 +1222,7 @@ struct security_operations {
|
||
|
|
int (*inode_link) (struct dentry *old_dentry,
|
||
|
|
struct inode *dir, struct dentry *new_dentry);
|
||
|
|
int (*inode_unlink) (struct inode *dir, struct dentry *dentry);
|
||
|
|
- int (*inode_symlink) (struct inode *dir,
|
||
|
|
+ int (*inode_symlink) (struct inode *dir, struct vfsmount *mnt,
|
||
|
|
struct dentry *dentry, const char *old_name);
|
||
|
|
int (*inode_mkdir) (struct inode *dir, struct vfsmount *mnt,
|
||
|
|
struct dentry *dentry, int mode);
|
||
|
|
@@ -1652,12 +1653,13 @@ static inline int security_inode_unlink
|
||
|
|
}
|
||
|
|
|
||
|
|
static inline int security_inode_symlink (struct inode *dir,
|
||
|
|
+ struct vfsmount *mnt,
|
||
|
|
struct dentry *dentry,
|
||
|
|
const char *old_name)
|
||
|
|
{
|
||
|
|
if (unlikely (IS_PRIVATE (dir)))
|
||
|
|
return 0;
|
||
|
|
- return security_ops->inode_symlink (dir, dentry, old_name);
|
||
|
|
+ return security_ops->inode_symlink (dir, mnt, dentry, old_name);
|
||
|
|
}
|
||
|
|
|
||
|
|
static inline int security_inode_mkdir (struct inode *dir,
|
||
|
|
@@ -2377,6 +2379,7 @@ static inline int security_inode_unlink
|
||
|
|
}
|
||
|
|
|
||
|
|
static inline int security_inode_symlink (struct inode *dir,
|
||
|
|
+ struct vfsmount *mnt,
|
||
|
|
struct dentry *dentry,
|
||
|
|
const char *old_name)
|
||
|
|
{
|
||
|
|
Index: linux-2.6.19/security/dummy.c
|
||
|
|
===================================================================
|
||
|
|
--- linux-2.6.19.orig/security/dummy.c
|
||
|
|
+++ linux-2.6.19/security/dummy.c
|
||
|
|
@@ -281,8 +281,8 @@ static int dummy_inode_unlink (struct in
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
-static int dummy_inode_symlink (struct inode *inode, struct dentry *dentry,
|
||
|
|
- const char *name)
|
||
|
|
+static int dummy_inode_symlink (struct inode *inode, struct vfsmount *mnt,
|
||
|
|
+ struct dentry *dentry, const char *name)
|
||
|
|
{
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
Index: linux-2.6.19/security/selinux/hooks.c
|
||
|
|
===================================================================
|
||
|
|
--- linux-2.6.19.orig/security/selinux/hooks.c
|
||
|
|
+++ linux-2.6.19/security/selinux/hooks.c
|
||
|
|
@@ -2155,7 +2155,8 @@ static int selinux_inode_unlink(struct i
|
||
|
|
return may_link(dir, dentry, MAY_UNLINK);
|
||
|
|
}
|
||
|
|
|
||
|
|
-static int selinux_inode_symlink(struct inode *dir, struct dentry *dentry, const char *name)
|
||
|
|
+static int selinux_inode_symlink(struct inode *dir, struct vfsmount *mnt,
|
||
|
|
+ struct dentry *dentry, const char *name)
|
||
|
|
{
|
||
|
|
return may_create(dir, dentry, SECCLASS_LNK_FILE);
|
||
|
|
}
|