mirror of
https://gitlab.com/apparmor/apparmor.git
synced 2025-03-04 16:35:02 +01:00
93 lines
3.2 KiB
Diff
93 lines
3.2 KiB
Diff
Pass struct vfsmount to the inode_mknod LSM hook
|
|
|
|
Signed-off-by: Tony Jones <tonyj@suse.de>
|
|
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
|
|
|
|
Index: b/fs/namei.c
|
|
===================================================================
|
|
--- a/fs/namei.c
|
|
+++ b/fs/namei.c
|
|
@@ -1851,7 +1851,7 @@ int vfs_mknod(struct inode *dir, struct
|
|
if (!dir->i_op || !dir->i_op->mknod)
|
|
return -EPERM;
|
|
|
|
- error = security_inode_mknod(dir, dentry, mode, dev);
|
|
+ error = security_inode_mknod(dir, dentry, mnt, mode, dev);
|
|
if (error)
|
|
return error;
|
|
|
|
Index: b/include/linux/security.h
|
|
===================================================================
|
|
--- a/include/linux/security.h
|
|
+++ b/include/linux/security.h
|
|
@@ -323,6 +323,7 @@ struct request_sock;
|
|
* and not this hook.
|
|
* @dir contains the inode structure of parent of the new file.
|
|
* @dentry contains the dentry structure of the new file.
|
|
+ * @mnt is the vfsmount corresponding to @dentry (may be NULL).
|
|
* @mode contains the mode of the new file.
|
|
* @dev contains the the device number.
|
|
* Return 0 if permission is granted.
|
|
@@ -1218,7 +1219,7 @@ struct security_operations {
|
|
struct vfsmount *mnt, int mode);
|
|
int (*inode_rmdir) (struct inode *dir, struct dentry *dentry);
|
|
int (*inode_mknod) (struct inode *dir, struct dentry *dentry,
|
|
- int mode, dev_t dev);
|
|
+ struct vfsmount *mnt, int mode, dev_t dev);
|
|
int (*inode_rename) (struct inode *old_dir, struct dentry *old_dentry,
|
|
struct inode *new_dir, struct dentry *new_dentry);
|
|
int (*inode_readlink) (struct dentry *dentry);
|
|
@@ -1670,11 +1671,12 @@ static inline int security_inode_rmdir (
|
|
|
|
static inline int security_inode_mknod (struct inode *dir,
|
|
struct dentry *dentry,
|
|
+ struct vfsmount *mnt,
|
|
int mode, dev_t dev)
|
|
{
|
|
if (unlikely (IS_PRIVATE (dir)))
|
|
return 0;
|
|
- return security_ops->inode_mknod (dir, dentry, mode, dev);
|
|
+ return security_ops->inode_mknod (dir, dentry, mnt, mode, dev);
|
|
}
|
|
|
|
static inline int security_inode_rename (struct inode *old_dir,
|
|
@@ -2388,6 +2390,7 @@ static inline int security_inode_rmdir (
|
|
|
|
static inline int security_inode_mknod (struct inode *dir,
|
|
struct dentry *dentry,
|
|
+ struct vfsmount *mnt,
|
|
int mode, dev_t dev)
|
|
{
|
|
return 0;
|
|
Index: b/security/dummy.c
|
|
===================================================================
|
|
--- a/security/dummy.c
|
|
+++ b/security/dummy.c
|
|
@@ -299,7 +299,7 @@ static int dummy_inode_rmdir (struct ino
|
|
}
|
|
|
|
static int dummy_inode_mknod (struct inode *inode, struct dentry *dentry,
|
|
- int mode, dev_t dev)
|
|
+ struct vfsmount *mnt, int mode, dev_t dev)
|
|
{
|
|
return 0;
|
|
}
|
|
Index: b/security/selinux/hooks.c
|
|
===================================================================
|
|
--- a/security/selinux/hooks.c
|
|
+++ b/security/selinux/hooks.c
|
|
@@ -2220,11 +2220,12 @@ static int selinux_inode_rmdir(struct in
|
|
return may_link(dir, dentry, MAY_RMDIR);
|
|
}
|
|
|
|
-static int selinux_inode_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
|
|
+static int selinux_inode_mknod(struct inode *dir, struct dentry *dentry,
|
|
+ struct vfsmount *mnt, int mode, dev_t dev)
|
|
{
|
|
int rc;
|
|
|
|
- rc = secondary_ops->inode_mknod(dir, dentry, mode, dev);
|
|
+ rc = secondary_ops->inode_mknod(dir, dentry, mnt, mode, dev);
|
|
if (rc)
|
|
return rc;
|
|
|