From patchwork Fri Jan 24 04:15:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 11349725 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 734121580 for ; Fri, 24 Jan 2020 04:16:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4DCB020838 for ; Fri, 24 Jan 2020 04:16:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579839390; bh=P4Jj/gWr+XYP4ZW/azAXDjVKUPcT3QkTSvvtSDH6Vhc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=vZ/R6HX40aXqs63bp8HrHkH3aJzagxNxa3YJeBgCYBhArfEkJhoGCIwbClnFQQ+6m Ek6TGv70g26lgTbFBYRkHvZtJ8UDs6J+xBkJtNI9BZBXRJOtgKSu4LuUiJyeHV+hav RN46R14hQJikNOkIhbK08WBIb7p+1bTScoUET5w8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730082AbgAXEQ2 (ORCPT ); Thu, 23 Jan 2020 23:16:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:47848 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729922AbgAXEQ1 (ORCPT ); Thu, 23 Jan 2020 23:16:27 -0500 Received: from sol.hsd1.ca.comcast.net (c-107-3-166-239.hsd1.ca.comcast.net [107.3.166.239]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3FA3020709; Fri, 24 Jan 2020 04:16:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579839387; bh=P4Jj/gWr+XYP4ZW/azAXDjVKUPcT3QkTSvvtSDH6Vhc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BPaiJTQGk40HlZLsznQzRSJc9o9Th9gzAlhatLMJCgMPcWMtI2UsUc67LfowvfVZ4 jJioBZxI1A8/iM30EjFE9Icdh1KbkUakBHDX5i0bOjVHzXbR9pOb/MQgoPK729MNoe WDPXtAHofn6UblKONZR4z57mGkjIyICk/qRFK39g= From: Eric Biggers To: linux-f2fs-devel@lists.sourceforge.net Cc: linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, Alexander Viro , Daniel Rosenberg , Gabriel Krisman Bertazi Subject: [PATCH 1/2] f2fs: fix dcache lookup of !casefolded directories Date: Thu, 23 Jan 2020 20:15:48 -0800 Message-Id: <20200124041549.159983-2-ebiggers@kernel.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124041549.159983-1-ebiggers@kernel.org> References: <20200124041549.159983-1-ebiggers@kernel.org> MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org From: Eric Biggers Do the name comparison for non-casefolded directories correctly. This is analogous to ext4's commit 66883da1eee8 ("ext4: fix dcache lookup of !casefolded directories"). Fixes: 2c2eb7a300cd ("f2fs: Support case-insensitive file name lookups") Cc: # v5.4+ Signed-off-by: Eric Biggers --- fs/f2fs/dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index b56f6060c1a6b..aea9e2806144d 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -1087,7 +1087,7 @@ static int f2fs_d_compare(const struct dentry *dentry, unsigned int len, if (!IS_CASEFOLDED(dentry->d_parent->d_inode)) { if (len != name->len) return -1; - return memcmp(str, name, len); + return memcmp(str, name->name, len); } return f2fs_ci_compare(dentry->d_parent->d_inode, name, &qstr, false); From patchwork Fri Jan 24 04:15:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 11349727 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A44CD17EF for ; Fri, 24 Jan 2020 04:16:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7E95420838 for ; Fri, 24 Jan 2020 04:16:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579839390; bh=kj/UPIlxMTG1LNrRNQzAQibp9tj2WikH8O930HrmAmU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ldJXcM7Zj4a+IOH7+jYuJZYwcH/RxgCVbGr7EaSZjqQ0OP21B3XJeiU2yEw8wIZxk IALK8JehFjfYF1voFcn/h/sjdMck6/HUrin0agoAHoOYtydWBA53MsR+n2Sd7xOB6k ImFEK5jV3UtoYnYHigLoMEMdsbOrRMGhvdaNiz0c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730136AbgAXEQ2 (ORCPT ); Thu, 23 Jan 2020 23:16:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:47864 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729797AbgAXEQ2 (ORCPT ); Thu, 23 Jan 2020 23:16:28 -0500 Received: from sol.hsd1.ca.comcast.net (c-107-3-166-239.hsd1.ca.comcast.net [107.3.166.239]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 920902070A; Fri, 24 Jan 2020 04:16:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579839387; bh=kj/UPIlxMTG1LNrRNQzAQibp9tj2WikH8O930HrmAmU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a67IdEUAnRcrrHdsQK7Nbl5g7OMOKGhUa7H2t42Ofc5V4ViYMbnvhK/a34YlJ+krO vmTgWu/vfSimME2bI6MPvtXho8XRo0ExKGAxkWCy262Xx8CsCGhYC/qMYhcQmegp9w qkPDAlLSC701dz3K1kcrqiHoKDf0AfVYXDtnfgjk= From: Eric Biggers To: linux-f2fs-devel@lists.sourceforge.net Cc: linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, Alexander Viro , Daniel Rosenberg , Gabriel Krisman Bertazi Subject: [PATCH 2/2] f2fs: fix race conditions in ->d_compare() and ->d_hash() Date: Thu, 23 Jan 2020 20:15:49 -0800 Message-Id: <20200124041549.159983-3-ebiggers@kernel.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124041549.159983-1-ebiggers@kernel.org> References: <20200124041549.159983-1-ebiggers@kernel.org> MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org From: Eric Biggers Since ->d_compare() and ->d_hash() can be called in RCU-walk mode, ->d_parent and ->d_inode can be concurrently modified, and in particular, ->d_inode may be changed to NULL. For f2fs_d_hash() this resulted in a reproducible NULL dereference if a lookup is done in a directory being deleted, e.g. with: int main() { if (fork()) { for (;;) { mkdir("subdir", 0700); rmdir("subdir"); } } else { for (;;) access("subdir/file", 0); } } ... or by running the 't_encrypted_d_revalidate' program from xfstests. Both repros work in any directory on a filesystem with the encoding feature, even if the directory doesn't actually have the casefold flag. I couldn't reproduce a crash in f2fs_d_compare(), but it appears that a similar crash is possible there. Fix these bugs by reading ->d_parent and ->d_inode using READ_ONCE() and falling back to the case sensitive behavior if the inode is NULL. Reported-by: Al Viro Fixes: 2c2eb7a300cd ("f2fs: Support case-insensitive file name lookups") Cc: # v5.4+ Signed-off-by: Eric Biggers --- fs/f2fs/dir.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index aea9e2806144d..d7c9a2cda4899 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -1083,24 +1083,27 @@ static int f2fs_d_compare(const struct dentry *dentry, unsigned int len, const char *str, const struct qstr *name) { struct qstr qstr = {.name = str, .len = len }; + const struct dentry *parent = READ_ONCE(dentry->d_parent); + const struct inode *inode = READ_ONCE(parent->d_inode); - if (!IS_CASEFOLDED(dentry->d_parent->d_inode)) { + if (!inode || !IS_CASEFOLDED(inode)) { if (len != name->len) return -1; return memcmp(str, name->name, len); } - return f2fs_ci_compare(dentry->d_parent->d_inode, name, &qstr, false); + return f2fs_ci_compare(inode, name, &qstr, false); } static int f2fs_d_hash(const struct dentry *dentry, struct qstr *str) { struct f2fs_sb_info *sbi = F2FS_SB(dentry->d_sb); const struct unicode_map *um = sbi->s_encoding; + const struct inode *inode = READ_ONCE(dentry->d_inode); unsigned char *norm; int len, ret = 0; - if (!IS_CASEFOLDED(dentry->d_inode)) + if (!inode || !IS_CASEFOLDED(inode)) return 0; norm = f2fs_kmalloc(sbi, PATH_MAX, GFP_ATOMIC);