mirror of
https://gitlab.com/apparmor/apparmor
synced 2025-09-06 01:05:11 +00:00
107 lines
4.1 KiB
Diff
107 lines
4.1 KiB
Diff
|
Pass struct vfsmount to the inode_setattr LSM hook
|
||
|
|
|
||
|
|
Signed-off-by: Tony Jones <tonyj@suse.de>
|
||
|
|
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
|
||
|
|
|
||
|
|
Index: linux-2.6.19/fs/attr.c
|
||
|
|
===================================================================
|
||
|
|
--- linux-2.6.19.orig/fs/attr.c
|
||
|
|
+++ linux-2.6.19/fs/attr.c
|
||
|
|
@@ -145,13 +145,13 @@ int notify_change(struct vfsmount *mnt,
|
||
|
|
down_write(&dentry->d_inode->i_alloc_sem);
|
||
|
|
|
||
|
|
if (inode->i_op && inode->i_op->setattr) {
|
||
|
|
- error = security_inode_setattr(dentry, attr);
|
||
|
|
+ error = security_inode_setattr(mnt, dentry, attr);
|
||
|
|
if (!error)
|
||
|
|
error = inode->i_op->setattr(dentry, attr);
|
||
|
|
} else {
|
||
|
|
error = inode_change_ok(inode, attr);
|
||
|
|
if (!error)
|
||
|
|
- error = security_inode_setattr(dentry, attr);
|
||
|
|
+ error = security_inode_setattr(mnt, dentry, attr);
|
||
|
|
if (!error) {
|
||
|
|
if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
|
||
|
|
(ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))
|
||
|
|
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
|
||
|
|
@@ -357,6 +357,7 @@ struct request_sock;
|
||
|
|
* call to notify_change is performed from several locations, whenever
|
||
|
|
* file attributes change (such as when a file is truncated, chown/chmod
|
||
|
|
* operations, transferring disk quotas, etc).
|
||
|
|
+ * @mnt is the vfsmount where the dentry was looked up (may be NULL)
|
||
|
|
* @dentry contains the dentry structure for the file.
|
||
|
|
* @attr is the iattr structure containing the new file attributes.
|
||
|
|
* Return 0 if permission is granted.
|
||
|
|
@@ -1229,7 +1230,8 @@ struct security_operations {
|
||
|
|
int (*inode_readlink) (struct dentry *dentry);
|
||
|
|
int (*inode_follow_link) (struct dentry *dentry, struct nameidata *nd);
|
||
|
|
int (*inode_permission) (struct inode *inode, int mask, struct nameidata *nd);
|
||
|
|
- int (*inode_setattr) (struct dentry *dentry, struct iattr *attr);
|
||
|
|
+ int (*inode_setattr) (struct vfsmount *mnt, struct dentry *dentry,
|
||
|
|
+ struct iattr *attr);
|
||
|
|
int (*inode_getattr) (struct vfsmount *mnt, struct dentry *dentry);
|
||
|
|
void (*inode_delete) (struct inode *inode);
|
||
|
|
int (*inode_setxattr) (struct dentry *dentry, char *name, void *value,
|
||
|
|
@@ -1716,12 +1718,13 @@ static inline int security_inode_permiss
|
||
|
|
return security_ops->inode_permission (inode, mask, nd);
|
||
|
|
}
|
||
|
|
|
||
|
|
-static inline int security_inode_setattr (struct dentry *dentry,
|
||
|
|
+static inline int security_inode_setattr (struct vfsmount *mnt,
|
||
|
|
+ struct dentry *dentry,
|
||
|
|
struct iattr *attr)
|
||
|
|
{
|
||
|
|
if (unlikely (IS_PRIVATE (dentry->d_inode)))
|
||
|
|
return 0;
|
||
|
|
- return security_ops->inode_setattr (dentry, attr);
|
||
|
|
+ return security_ops->inode_setattr (mnt, dentry, attr);
|
||
|
|
}
|
||
|
|
|
||
|
|
static inline int security_inode_getattr (struct vfsmount *mnt,
|
||
|
|
@@ -2420,7 +2423,8 @@ static inline int security_inode_permiss
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
-static inline int security_inode_setattr (struct dentry *dentry,
|
||
|
|
+static inline int security_inode_setattr (struct vfsmount *mnt,
|
||
|
|
+ struct dentry *dentry,
|
||
|
|
struct iattr *attr)
|
||
|
|
{
|
||
|
|
return 0;
|
||
|
|
Index: linux-2.6.19/security/dummy.c
|
||
|
|
===================================================================
|
||
|
|
--- linux-2.6.19.orig/security/dummy.c
|
||
|
|
+++ linux-2.6.19/security/dummy.c
|
||
|
|
@@ -328,7 +328,8 @@ static int dummy_inode_permission (struc
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
-static int dummy_inode_setattr (struct dentry *dentry, struct iattr *iattr)
|
||
|
|
+static int dummy_inode_setattr (struct vfsmount *mnt, struct dentry *dentry,
|
||
|
|
+ struct iattr *iattr)
|
||
|
|
{
|
||
|
|
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
|
||
|
|
@@ -2220,11 +2220,12 @@ static int selinux_inode_permission(stru
|
||
|
|
file_mask_to_av(inode->i_mode, mask), NULL);
|
||
|
|
}
|
||
|
|
|
||
|
|
-static int selinux_inode_setattr(struct dentry *dentry, struct iattr *iattr)
|
||
|
|
+static int selinux_inode_setattr(struct vfsmount *mnt, struct dentry *dentry,
|
||
|
|
+ struct iattr *iattr)
|
||
|
|
{
|
||
|
|
int rc;
|
||
|
|
|
||
|
|
- rc = secondary_ops->inode_setattr(dentry, iattr);
|
||
|
|
+ rc = secondary_ops->inode_setattr(mnt, dentry, iattr);
|
||
|
|
if (rc)
|
||
|
|
return rc;
|
||
|
|
|