Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03a8bb0e authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

ext4/fscrypto: avoid RCU lookup in d_revalidate 



As Al pointed, d_revalidate should return RCU lookup before using d_inode.
This was originally introduced by:
commit 34286d66 ("fs: rcu-walk aware d_revalidate method").

Reported-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: stable <stable@vger.kernel.org>
parent b32e4482

fs/crypto/crypto.c

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/ratelimit.h>

#include <linux/bio.h>

#include <linux/dcache.h>

#include <linux/namei.h>

#include <linux/fscrypto.h>

#include <linux/ecryptfs.h>
@@ -353,6 +354,9 @@ static int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags) 
	struct fscrypt_info *ci;

	int dir_has_key, cached_with_key;



	if (flags & LOOKUP_RCU)

		return -ECHILD;



	dir = dget_parent(dentry);

	if (!d_inode(dir)->i_sb->s_cop->is_encrypted(d_inode(dir))) {

		dput(dir);

fs/ext4/crypto.c

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/random.h>

#include <linux/scatterlist.h>

#include <linux/spinlock_types.h>

#include <linux/namei.h>



#include "ext4_extents.h"

#include "xattr.h"
@@ -482,6 +483,9 @@ static int ext4_d_revalidate(struct dentry *dentry, unsigned int flags) 
	struct ext4_crypt_info *ci;

	int dir_has_key, cached_with_key;



	if (flags & LOOKUP_RCU)

		return -ECHILD;



	dir = dget_parent(dentry);

	if (!ext4_encrypted_inode(d_inode(dir))) {

		dput(dir);