security_d_instantiate(): move to the point prior to attaching dentry to inode (b9680917) · Commits · e / devices / kernel_gigaset_gs290

fs/dcache.c

+7 −8

Original line number	Diff line number	Diff line
		@@ -1775,11 +1775,11 @@ void d_instantiate(struct dentry entry, struct inode inode)
		{
		BUG_ON(!hlist_unhashed(&entry->d_u.d_alias));
		if (inode) {
		security_d_instantiate(entry, inode);
		spin_lock(&inode->i_lock);
		__d_instantiate(entry, inode);
		spin_unlock(&inode->i_lock);
		}
		security_d_instantiate(entry, inode);
		}
		EXPORT_SYMBOL(d_instantiate);

		@@ -1796,6 +1796,7 @@ int d_instantiate_no_diralias(struct dentry entry, struct inode inode)
		{
		BUG_ON(!hlist_unhashed(&entry->d_u.d_alias));

		security_d_instantiate(entry, inode);
		spin_lock(&inode->i_lock);
		if (S_ISDIR(inode->i_mode) && !hlist_empty(&inode->i_dentry)) {
		spin_unlock(&inode->i_lock);
		@@ -1804,7 +1805,6 @@ int d_instantiate_no_diralias(struct dentry entry, struct inode inode)
		}
		__d_instantiate(entry, inode);
		spin_unlock(&inode->i_lock);
		security_d_instantiate(entry, inode);

		return 0;
		}
		@@ -1878,6 +1878,7 @@ static struct dentry __d_obtain_alias(struct inode inode, int disconnected)
		goto out_iput;
		}

		security_d_instantiate(tmp, inode);
		spin_lock(&inode->i_lock);
		res = __d_find_any_alias(inode);
		if (res) {
		@@ -1900,13 +1901,10 @@ static struct dentry __d_obtain_alias(struct inode inode, int disconnected)
		hlist_bl_unlock(&tmp->d_sb->s_anon);
		spin_unlock(&tmp->d_lock);
		spin_unlock(&inode->i_lock);
		security_d_instantiate(tmp, inode);

		return tmp;

		out_iput:
		if (res && !IS_ERR(res))
		security_d_instantiate(res, inode);
		iput(inode);
		return res;
		}
		@@ -2372,7 +2370,6 @@ static inline void __d_add(struct dentry dentry, struct inode inode)
		__d_instantiate(dentry, inode);
		spin_unlock(&inode->i_lock);
		}
		security_d_instantiate(dentry, inode);
		d_rehash(dentry);
		}

		@@ -2387,8 +2384,10 @@ static inline void __d_add(struct dentry dentry, struct inode inode)

		void d_add(struct dentry entry, struct inode inode)
		{
		if (inode)
		if (inode) {
		security_d_instantiate(entry, inode);
		spin_lock(&inode->i_lock);
		}
		__d_add(entry, inode);
		}
		EXPORT_SYMBOL(d_add);
		@@ -2782,6 +2781,7 @@ struct dentry d_splice_alias(struct inode inode, struct dentry *dentry)
		if (!inode)
		goto out;

		security_d_instantiate(dentry, inode);
		spin_lock(&inode->i_lock);
		if (S_ISDIR(inode->i_mode)) {
		struct dentry *new = __d_find_any_alias(inode);
		@@ -2809,7 +2809,6 @@ struct dentry d_splice_alias(struct inode inode, struct dentry *dentry)
		} else {
		__d_move(new, dentry, false);
		write_sequnlock(&rename_lock);
		security_d_instantiate(new, inode);
		}
		iput(inode);
		return new;