Return-Path: Received: from mail-pf0-f193.google.com ([209.85.192.193]:35943 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751472AbdEDW1I (ORCPT ); Thu, 4 May 2017 18:27:08 -0400 Received: by mail-pf0-f193.google.com with SMTP id v14so3691627pfd.3 for ; Thu, 04 May 2017 15:27:07 -0700 (PDT) From: Eric Biggers To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , Jaegeuk Kim , Theodore Ts'o , Eric Biggers Subject: [PATCH 3/3] ext4/fscrypto: avoid RCU lookup in d_revalidate Date: Thu, 4 May 2017 15:26:20 -0700 Message-Id: <20170504222620.118347-3-ebiggers3@gmail.com> In-Reply-To: <20170504222620.118347-1-ebiggers3@gmail.com> References: <20170504222620.118347-1-ebiggers3@gmail.com> Sender: stable-owner@vger.kernel.org List-ID: From: Jaegeuk Kim commit 03a8bb0e53d9562276045bdfcf2b5de2e4cff5a1 upstream. Please apply to 4.4-stable. As Al pointed, d_revalidate should return RCU lookup before using d_inode. This was originally introduced by: commit 34286d666230 ("fs: rcu-walk aware d_revalidate method"). Reported-by: Al Viro Signed-off-by: Jaegeuk Kim Cc: Theodore Ts'o Cc: stable Signed-off-by: Eric Biggers --- fs/ext4/crypto.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/ext4/crypto.c b/fs/ext4/crypto.c index 1259ade2f10a..9d6c2dcf1bd0 100644 --- a/fs/ext4/crypto.c +++ b/fs/ext4/crypto.c @@ -34,6 +34,7 @@ #include #include #include +#include #include "ext4_extents.h" #include "xattr.h" @@ -481,6 +482,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); -- 2.13.0.rc1.294.g07d810a77f-goog