Commit c6f493d6 authored by David Howells's avatar David Howells Committed by Al Viro
Browse files

VFS: security/: d_backing_inode() annotations 



most of the ->d_inode uses there refer to the same inode IO would
go to, i.e. d_backing_inode()

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent c5ef6035

security/apparmor/file.c

+3 −3
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ unsigned int aa_str_perms(struct aa_dfa *dfa, unsigned int start, 
 */

static inline bool is_deleted(struct dentry *dentry)

{

	if (d_unlinked(dentry) && dentry->d_inode->i_nlink == 0)

	if (d_unlinked(dentry) && d_backing_inode(dentry)->i_nlink == 0)

		return 1;

	return 0;

}
@@ -351,8 +351,8 @@ int aa_path_link(struct aa_profile *profile, struct dentry *old_dentry, 
	struct path link = { new_dir->mnt, new_dentry };

	struct path target = { new_dir->mnt, old_dentry };

	struct path_cond cond = {

		old_dentry->d_inode->i_uid,

		old_dentry->d_inode->i_mode

		d_backing_inode(old_dentry)->i_uid,

		d_backing_inode(old_dentry)->i_mode

	};

	char *buffer = NULL, *buffer2 = NULL;

	const char *lname, *tname = NULL, *info = NULL;

security/apparmor/lsm.c

+9 −9
Original line number Diff line number Diff line
@@ -204,8 +204,8 @@ static int common_perm_mnt_dentry(int op, struct vfsmount *mnt, 
				  struct dentry *dentry, u32 mask)

{

	struct path path = { mnt, dentry };

	struct path_cond cond = { dentry->d_inode->i_uid,

				  dentry->d_inode->i_mode

	struct path_cond cond = { d_backing_inode(dentry)->i_uid,

				  d_backing_inode(dentry)->i_mode

	};



	return common_perm(op, &path, mask, &cond);
@@ -223,7 +223,7 @@ static int common_perm_mnt_dentry(int op, struct vfsmount *mnt, 
static int common_perm_rm(int op, struct path *dir,

			  struct dentry *dentry, u32 mask)

{

	struct inode *inode = dentry->d_inode;

	struct inode *inode = d_backing_inode(dentry);

	struct path_cond cond = { };



	if (!inode || !dir->mnt || !mediated_filesystem(dentry))
@@ -281,8 +281,8 @@ static int apparmor_path_mknod(struct path *dir, struct dentry *dentry, 


static int apparmor_path_truncate(struct path *path)

{

	struct path_cond cond = { path->dentry->d_inode->i_uid,

				  path->dentry->d_inode->i_mode

	struct path_cond cond = { d_backing_inode(path->dentry)->i_uid,

				  d_backing_inode(path->dentry)->i_mode

	};



	if (!path->mnt || !mediated_filesystem(path->dentry))
@@ -327,8 +327,8 @@ static int apparmor_path_rename(struct path *old_dir, struct dentry *old_dentry, 
	if (!unconfined(profile)) {

		struct path old_path = { old_dir->mnt, old_dentry };

		struct path new_path = { new_dir->mnt, new_dentry };

		struct path_cond cond = { old_dentry->d_inode->i_uid,

					  old_dentry->d_inode->i_mode

		struct path_cond cond = { d_backing_inode(old_dentry)->i_uid,

					  d_backing_inode(old_dentry)->i_mode

		};



		error = aa_path_perm(OP_RENAME_SRC, profile, &old_path, 0,
@@ -354,8 +354,8 @@ static int apparmor_path_chmod(struct path *path, umode_t mode) 


static int apparmor_path_chown(struct path *path, kuid_t uid, kgid_t gid)

{

	struct path_cond cond =  { path->dentry->d_inode->i_uid,

				   path->dentry->d_inode->i_mode

	struct path_cond cond =  { d_backing_inode(path->dentry)->i_uid,

				   d_backing_inode(path->dentry)->i_mode

	};



	if (!mediated_filesystem(path->dentry))

security/commoncap.c

+3 −3
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ static inline void bprm_clear_caps(struct linux_binprm *bprm) 
 */

int cap_inode_need_killpriv(struct dentry *dentry)

{

	struct inode *inode = dentry->d_inode;

	struct inode *inode = d_backing_inode(dentry);

	int error;



	if (!inode->i_op->getxattr)
@@ -319,7 +319,7 @@ int cap_inode_need_killpriv(struct dentry *dentry) 
 */

int cap_inode_killpriv(struct dentry *dentry)

{

	struct inode *inode = dentry->d_inode;

	struct inode *inode = d_backing_inode(dentry);



	if (!inode->i_op->removexattr)

	       return 0;
@@ -375,7 +375,7 @@ static inline int bprm_caps_from_vfs_caps(struct cpu_vfs_cap_data *caps, 
 */

int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps)

{

	struct inode *inode = dentry->d_inode;

	struct inode *inode = d_backing_inode(dentry);

	__u32 magic_etc;

	unsigned tocopy, i;

	int size;

security/integrity/evm/evm_crypto.c

+2 −2
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static int evm_calc_hmac_or_hash(struct dentry *dentry, 
				size_t req_xattr_value_len,

				char type, char *digest)

{

	struct inode *inode = dentry->d_inode;

	struct inode *inode = d_backing_inode(dentry);

	struct shash_desc *desc;

	char **xattrname;

	size_t xattr_size = 0;
@@ -199,7 +199,7 @@ int evm_calc_hash(struct dentry *dentry, const char *req_xattr_name, 
int evm_update_evmxattr(struct dentry *dentry, const char *xattr_name,

			const char *xattr_value, size_t xattr_value_len)

{

	struct inode *inode = dentry->d_inode;

	struct inode *inode = d_backing_inode(dentry);

	struct evm_ima_xattr_data xattr_data;

	int rc = 0;

security/integrity/evm/evm_main.c

+9 −9
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static void __init evm_init_config(void) 


static int evm_find_protected_xattrs(struct dentry *dentry)

{

	struct inode *inode = dentry->d_inode;

	struct inode *inode = d_backing_inode(dentry);

	char **xattr;

	int error;

	int count = 0;
@@ -165,8 +165,8 @@ static enum integrity_status evm_verify_hmac(struct dentry *dentry, 
			/* Replace RSA with HMAC if not mounted readonly and

			 * not immutable

			 */

			if (!IS_RDONLY(dentry->d_inode) &&

			    !IS_IMMUTABLE(dentry->d_inode))

			if (!IS_RDONLY(d_backing_inode(dentry)) &&

			    !IS_IMMUTABLE(d_backing_inode(dentry)))

				evm_update_evmxattr(dentry, xattr_name,

						    xattr_value,

						    xattr_value_len);
@@ -235,7 +235,7 @@ enum integrity_status evm_verifyxattr(struct dentry *dentry, 
		return INTEGRITY_UNKNOWN;



	if (!iint) {

		iint = integrity_iint_find(dentry->d_inode);

		iint = integrity_iint_find(d_backing_inode(dentry));

		if (!iint)

			return INTEGRITY_UNKNOWN;

	}
@@ -253,7 +253,7 @@ EXPORT_SYMBOL_GPL(evm_verifyxattr); 
 */

static enum integrity_status evm_verify_current_integrity(struct dentry *dentry)

{

	struct inode *inode = dentry->d_inode;

	struct inode *inode = d_backing_inode(dentry);



	if (!evm_initialized || !S_ISREG(inode->i_mode) || evm_fixmode)

		return 0;
@@ -293,13 +293,13 @@ static int evm_protect_xattr(struct dentry *dentry, const char *xattr_name, 
	if (evm_status == INTEGRITY_NOXATTRS) {

		struct integrity_iint_cache *iint;



		iint = integrity_iint_find(dentry->d_inode);

		iint = integrity_iint_find(d_backing_inode(dentry));

		if (iint && (iint->flags & IMA_NEW_FILE))

			return 0;

	}

out:

	if (evm_status != INTEGRITY_PASS)

		integrity_audit_msg(AUDIT_INTEGRITY_METADATA, dentry->d_inode,

		integrity_audit_msg(AUDIT_INTEGRITY_METADATA, d_backing_inode(dentry),

				    dentry->d_name.name, "appraise_metadata",

				    integrity_status_msg[evm_status],

				    -EPERM, 0);
@@ -379,7 +379,7 @@ void evm_inode_post_setxattr(struct dentry *dentry, const char *xattr_name, 
 */

void evm_inode_post_removexattr(struct dentry *dentry, const char *xattr_name)

{

	struct inode *inode = dentry->d_inode;

	struct inode *inode = d_backing_inode(dentry);



	if (!evm_initialized || !evm_protected_xattr(xattr_name))

		return;
@@ -404,7 +404,7 @@ int evm_inode_setattr(struct dentry *dentry, struct iattr *attr) 
	if ((evm_status == INTEGRITY_PASS) ||

	    (evm_status == INTEGRITY_NOXATTRS))

		return 0;

	integrity_audit_msg(AUDIT_INTEGRITY_METADATA, dentry->d_inode,

	integrity_audit_msg(AUDIT_INTEGRITY_METADATA, d_backing_inode(dentry),

			    dentry->d_name.name, "appraise_metadata",

			    integrity_status_msg[evm_status], -EPERM, 0);

	return -EPERM;