From: Daniel Rosenberg <drosen@google.com> To: "Theodore Ts'o" <tytso@mit.edu>, linux-ext4@vger.kernel.org, Jaegeuk Kim <jaegeuk@kernel.org>, Chao Yu <chao@kernel.org>, linux-f2fs-devel@lists.sourceforge.net, Eric Biggers <ebiggers@kernel.org>, linux-fscrypt@vger.kernel.org, Alexander Viro <viro@zeniv.linux.org.uk> Cc: Andreas Dilger <adilger.kernel@dilger.ca>, Jonathan Corbet <corbet@lwn.net>, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Gabriel Krisman Bertazi <krisman@collabora.com>, kernel-team@android.com, Daniel Rosenberg <drosen@google.com> Subject: [PATCH 0/8] Support for Casefolding and Encryption Date: Mon, 2 Dec 2019 21:10:41 -0800 [thread overview] Message-ID: <20191203051049.44573-1-drosen@google.com> (raw) Ext4 and F2FS currently both support casefolding and encryption, but not at the same time. These patches aim to rectify that. Since directory names are stored case preserved, we cannot just take the hash of the ciphertext. Instead we use the siphash of the casefolded name. With this we no longer have a direct path from an encrypted name to the hash without the key. To deal with this, fscrypt now always includes the hash in the name it presents when the key is not present. There is a pre-existing bug where you can change parts of the hash and still match the name so long as the disruption to the hash does not happen to affect lookup on that filesystem. I'm not sure how to fix that without making ext4 lookups slower in the more common case. I moved the identical dcache operations for ext4 and f2fs into the VFS, as any filesystem that uses casefolding will need the same code. This will also allow further optimizations to that path, although my current changes don't take advantage of that yet. For Ext4, this also means that we need to store the hash on disk. We only do so for encrypted and casefolded directories to avoid on disk format changes. Previously encryption and casefolding could not live on the same filesystem, and we're relaxing that requirement. F2fs is a bit more straightforward since it already stores hashes on disk. I've updated the related tools with just enough to enable the feature. I still need to adjust their respective fsck's, although without access to the keys, they won't be able to verify the hashes of casefolded and encrypted names. Daniel Rosenberg (8): fscrypt: Add siphash and hash key for policy v2 fscrypt: Don't allow v1 policies with casefolding fscrypt: Change format of no-key token vfs: Fold casefolding into vfs f2fs: Handle casefolding with Encryption ext4: Use struct super_blocks' casefold data ext4: Hande casefolding with encryption ext4: Optimize match for casefolded encrypted dirs Documentation/filesystems/ext4/directory.rst | 27 ++ fs/crypto/Kconfig | 1 + fs/crypto/fname.c | 204 +++++++++--- fs/crypto/fscrypt_private.h | 9 + fs/crypto/keysetup.c | 29 +- fs/crypto/policy.c | 26 +- fs/dcache.c | 35 ++ fs/ext4/dir.c | 72 +---- fs/ext4/ext4.h | 87 +++-- fs/ext4/hash.c | 26 +- fs/ext4/ialloc.c | 5 +- fs/ext4/inline.c | 41 +-- fs/ext4/namei.c | 318 ++++++++++++------- fs/ext4/super.c | 21 +- fs/f2fs/dir.c | 115 +++---- fs/f2fs/f2fs.h | 14 +- fs/f2fs/hash.c | 25 +- fs/f2fs/inline.c | 9 +- fs/f2fs/super.c | 17 +- fs/f2fs/sysfs.c | 8 +- fs/inode.c | 8 + fs/namei.c | 43 ++- include/linux/fs.h | 12 + include/linux/fscrypt.h | 107 +++---- 24 files changed, 797 insertions(+), 462 deletions(-) -- 2.24.0.393.g34dc348eaf-goog
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Rosenberg via Linux-f2fs-devel <linux-f2fs-devel@lists.sourceforge.net> To: "Theodore Ts'o" <tytso@mit.edu>, linux-ext4@vger.kernel.org, Jaegeuk Kim <jaegeuk@kernel.org>, Chao Yu <chao@kernel.org>, linux-f2fs-devel@lists.sourceforge.net, Eric Biggers <ebiggers@kernel.org>, linux-fscrypt@vger.kernel.org, Alexander Viro <viro@zeniv.linux.org.uk> Cc: Daniel Rosenberg <drosen@google.com>, linux-doc@vger.kernel.org, kernel-team@android.com, Jonathan Corbet <corbet@lwn.net>, linux-kernel@vger.kernel.org, Andreas Dilger <adilger.kernel@dilger.ca>, linux-fsdevel@vger.kernel.org, Gabriel Krisman Bertazi <krisman@collabora.com> Subject: [f2fs-dev] [PATCH 0/8] Support for Casefolding and Encryption Date: Mon, 2 Dec 2019 21:10:41 -0800 [thread overview] Message-ID: <20191203051049.44573-1-drosen@google.com> (raw) Ext4 and F2FS currently both support casefolding and encryption, but not at the same time. These patches aim to rectify that. Since directory names are stored case preserved, we cannot just take the hash of the ciphertext. Instead we use the siphash of the casefolded name. With this we no longer have a direct path from an encrypted name to the hash without the key. To deal with this, fscrypt now always includes the hash in the name it presents when the key is not present. There is a pre-existing bug where you can change parts of the hash and still match the name so long as the disruption to the hash does not happen to affect lookup on that filesystem. I'm not sure how to fix that without making ext4 lookups slower in the more common case. I moved the identical dcache operations for ext4 and f2fs into the VFS, as any filesystem that uses casefolding will need the same code. This will also allow further optimizations to that path, although my current changes don't take advantage of that yet. For Ext4, this also means that we need to store the hash on disk. We only do so for encrypted and casefolded directories to avoid on disk format changes. Previously encryption and casefolding could not live on the same filesystem, and we're relaxing that requirement. F2fs is a bit more straightforward since it already stores hashes on disk. I've updated the related tools with just enough to enable the feature. I still need to adjust their respective fsck's, although without access to the keys, they won't be able to verify the hashes of casefolded and encrypted names. Daniel Rosenberg (8): fscrypt: Add siphash and hash key for policy v2 fscrypt: Don't allow v1 policies with casefolding fscrypt: Change format of no-key token vfs: Fold casefolding into vfs f2fs: Handle casefolding with Encryption ext4: Use struct super_blocks' casefold data ext4: Hande casefolding with encryption ext4: Optimize match for casefolded encrypted dirs Documentation/filesystems/ext4/directory.rst | 27 ++ fs/crypto/Kconfig | 1 + fs/crypto/fname.c | 204 +++++++++--- fs/crypto/fscrypt_private.h | 9 + fs/crypto/keysetup.c | 29 +- fs/crypto/policy.c | 26 +- fs/dcache.c | 35 ++ fs/ext4/dir.c | 72 +---- fs/ext4/ext4.h | 87 +++-- fs/ext4/hash.c | 26 +- fs/ext4/ialloc.c | 5 +- fs/ext4/inline.c | 41 +-- fs/ext4/namei.c | 318 ++++++++++++------- fs/ext4/super.c | 21 +- fs/f2fs/dir.c | 115 +++---- fs/f2fs/f2fs.h | 14 +- fs/f2fs/hash.c | 25 +- fs/f2fs/inline.c | 9 +- fs/f2fs/super.c | 17 +- fs/f2fs/sysfs.c | 8 +- fs/inode.c | 8 + fs/namei.c | 43 ++- include/linux/fs.h | 12 + include/linux/fscrypt.h | 107 +++---- 24 files changed, 797 insertions(+), 462 deletions(-) -- 2.24.0.393.g34dc348eaf-goog _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
next reply other threads:[~2019-12-03 5:11 UTC|newest] Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-12-03 5:10 Daniel Rosenberg [this message] 2019-12-03 5:10 ` [f2fs-dev] [PATCH 0/8] Support for Casefolding and Encryption Daniel Rosenberg via Linux-f2fs-devel 2019-12-03 5:10 ` [PATCH 1/8] fscrypt: Add siphash and hash key for policy v2 Daniel Rosenberg 2019-12-03 5:10 ` [f2fs-dev] " Daniel Rosenberg via Linux-f2fs-devel 2019-12-03 23:25 ` Eric Biggers 2019-12-03 23:25 ` [f2fs-dev] " Eric Biggers 2019-12-03 5:10 ` [PATCH 2/8] fscrypt: Don't allow v1 policies with casefolding Daniel Rosenberg 2019-12-03 5:10 ` [f2fs-dev] " Daniel Rosenberg via Linux-f2fs-devel 2019-12-03 23:37 ` Eric Biggers 2019-12-03 23:37 ` [f2fs-dev] " Eric Biggers 2019-12-03 5:10 ` [PATCH 3/8] fscrypt: Change format of no-key token Daniel Rosenberg 2019-12-03 5:10 ` [f2fs-dev] " Daniel Rosenberg via Linux-f2fs-devel 2019-12-04 0:09 ` Eric Biggers 2019-12-04 0:09 ` [f2fs-dev] " Eric Biggers 2019-12-03 5:10 ` [PATCH 4/8] vfs: Fold casefolding into vfs Daniel Rosenberg 2019-12-03 5:10 ` [f2fs-dev] " Daniel Rosenberg via Linux-f2fs-devel 2019-12-03 7:41 ` Gao Xiang 2019-12-03 7:41 ` [f2fs-dev] " Gao Xiang 2019-12-03 19:42 ` Gabriel Krisman Bertazi 2019-12-03 19:42 ` [f2fs-dev] " Gabriel Krisman Bertazi 2019-12-03 20:34 ` Eric Biggers 2019-12-03 20:34 ` [f2fs-dev] " Eric Biggers 2019-12-03 21:21 ` Gabriel Krisman Bertazi 2019-12-03 21:21 ` [f2fs-dev] " Gabriel Krisman Bertazi 2019-12-04 0:32 ` Eric Biggers 2019-12-04 0:32 ` [f2fs-dev] " Eric Biggers 2019-12-03 19:31 ` Gabriel Krisman Bertazi 2019-12-03 19:31 ` [f2fs-dev] " Gabriel Krisman Bertazi 2020-01-03 20:26 ` Theodore Y. Ts'o 2020-01-03 20:26 ` [f2fs-dev] " Theodore Y. Ts'o 2019-12-03 5:10 ` [PATCH 5/8] f2fs: Handle casefolding with Encryption Daniel Rosenberg 2019-12-03 5:10 ` [f2fs-dev] " Daniel Rosenberg via Linux-f2fs-devel 2019-12-05 1:17 ` kbuild test robot 2019-12-05 1:17 ` kbuild test robot 2019-12-05 1:17 ` [f2fs-dev] " kbuild test robot 2019-12-03 5:10 ` [PATCH 6/8] ext4: Use struct super_block's casefold data Daniel Rosenberg 2019-12-03 5:10 ` [f2fs-dev] " Daniel Rosenberg via Linux-f2fs-devel 2019-12-03 19:44 ` Gabriel Krisman Bertazi 2019-12-03 19:44 ` [f2fs-dev] " Gabriel Krisman Bertazi 2019-12-03 5:10 ` [PATCH 7/8] ext4: Hande casefolding with encryption Daniel Rosenberg 2019-12-03 5:10 ` [f2fs-dev] " Daniel Rosenberg via Linux-f2fs-devel 2019-12-03 5:10 ` [PATCH 8/8] ext4: Optimize match for casefolded encrypted dirs Daniel Rosenberg 2019-12-03 5:10 ` [f2fs-dev] " Daniel Rosenberg via Linux-f2fs-devel
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191203051049.44573-1-drosen@google.com \ --to=drosen@google.com \ --cc=adilger.kernel@dilger.ca \ --cc=chao@kernel.org \ --cc=corbet@lwn.net \ --cc=ebiggers@kernel.org \ --cc=jaegeuk@kernel.org \ --cc=kernel-team@android.com \ --cc=krisman@collabora.com \ --cc=linux-doc@vger.kernel.org \ --cc=linux-ext4@vger.kernel.org \ --cc=linux-f2fs-devel@lists.sourceforge.net \ --cc=linux-fscrypt@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=tytso@mit.edu \ --cc=viro@zeniv.linux.org.uk \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.