Add support for Encryption and Casefolding in F2FS
Subsystems (6)
v2 cover Add support for Encryption and Casefolding in F2FS
These patches are on top of the torvalds tree.
F2FS currently supports casefolding and encryption, but not at the same time. These patches aim to rectify that. In a later follow up, this will be added for Ext4 as well. I've included one ext4 patch from the previous set since it isn't in the f2fs branch, but is needed for the fscrypt changes.
The f2fs-tools changes have already been applied.
Since both fscrypt and casefolding require their own dentry operations, I've moved the responsibility of setting the dentry operations from fscrypt to the filesystems and provided helper functions that should work for most cases.
These are a follow-up to the previously sent patch set "[PATCH v12 0/4] Prepare for upcoming Casefolding/Encryption patches"
v2:
Simplified generic dentry_op function
Passed through errors in f2fs_match_ci_name
Daniel Rosenberg (3):
libfs: Add generic function for setting dentry_ops
fscrypt: Have filesystems handle their d_ops
f2fs: Handle casefolding with Encryption
fs/crypto/fname.c | 4 -- fs/crypto/hooks.c | 1 - fs/ext4/dir.c | 7 --- fs/ext4/ext4.h | 4 -- fs/ext4/namei.c | 1 + fs/ext4/super.c | 5 --- fs/f2fs/dir.c | 96 +++++++++++++++++++++++++++++++---------- fs/f2fs/f2fs.h | 11 +++-- fs/f2fs/hash.c | 11 ++++- fs/f2fs/inline.c | 4 ++ fs/f2fs/namei.c | 1 + fs/f2fs/recovery.c | 12 +++++- fs/f2fs/super.c | 7 --- fs/libfs.c | 60 ++++++++++++++++++++++++++ fs/ubifs/dir.c | 1 + include/linux/fs.h | 1 + include/linux/fscrypt.h | 5 ++- 17 files changed, 170 insertions(+), 61 deletions(-)
Signature · 1 line
2.29.2.299.gdc1121823c-goog
PATCH v2 1/3 libfs: Add generic function for setting dentry_ops
This adds a function to set dentry operations at lookup time that will work for both encrypted filenames and casefolded filenames.
A filesystem that supports both features simultaneously can use this function during lookup preparations to set up its dentry operations once fscrypt no longer does that itself.
Currently the casefolding dentry operation are always set if the filesystem defines an encoding because the features is toggleable on empty directories. Since we don't know what set of functions we'll eventually need, and cannot change them later, we add just add them.
--- fs/libfs.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++ include/linux/fs.h | 1 + 2 files changed, 61 insertions(+)
fs/libfs.c +60 -0
@@ -1449,4 +1449,64 @@ int generic_ci_d_hash(const struct dentry *dentry, struct qstr *str)return 0 ; }EXPORT_SYMBOL (generic_ci_d_hash); + +static const struct dentry_operations generic_ci_dentry_ops = { + .d_hash = generic_ci_d_hash, + .d_compare = generic_ci_d_compare, +};#endif + +#ifdef CONFIG_FS_ENCRYPTION +static const struct dentry_operations generic_encrypted_dentry_ops = { + .d_revalidate = fscrypt_d_revalidate, +}; +#endif + +#if IS_ENABLED (CONFIG_UNICODE ) &&IS_ENABLED (CONFIG_FS_ENCRYPTION ) +static const struct dentry_operations generic_encrypted_ci_dentry_ops = { + .d_hash = generic_ci_d_hash, + .d_compare = generic_ci_d_compare, + .d_revalidate = fscrypt_d_revalidate, +}; +#endif + +/** +* generic_set_encrypted_ci_d_ops - helper for setting d_ops for given dentry +* @dentry: dentry to set ops on +* +* This function sets the dentry ops for the given dentry to handle both +* casefolded and encrypted dentry names. +* +* Encryption requires d_revalidate to remove nokey names once the key is present. +* Casefolding is toggleable on an empty directory. Since we can't change the +* operations later on, we just add the casefolding ops if the filesystem defines an +* encoding. +*/ +void generic_set_encrypted_ci_d_ops (struct dentry *dentry) +{ +#ifdef CONFIG_FS_ENCRYPTION +bool needs_encrypt_ops = dentry->d_flags &DCACHE_NOKEY_NAME ; +#endif +#ifdef CONFIG_UNICODE +bool needs_ci_ops = dentry->d_sb->s_encoding; +#endif +#if defined(CONFIG_FS_ENCRYPTION ) && defined(CONFIG_UNICODE ) +if (needs_encrypt_ops && needs_ci_ops) { +d_set_d_op (dentry, &generic_encrypted_ci_dentry_ops); +return ; + } +#endif +#ifdef CONFIG_FS_ENCRYPTION +if (needs_encrypt_ops) { +d_set_d_op (dentry, &generic_encrypted_dentry_ops); +return ; + } +#endif +#ifdef CONFIG_UNICODE +if (needs_ci_ops) { +d_set_d_op (dentry, &generic_ci_dentry_ops); +return ; + } +#endif +} +EXPORT_SYMBOL (generic_set_encrypted_ci_d_ops);
include/linux/fs.h +1 -0
@@ -3202,6 +3202,7 @@ extern int generic_ci_d_hash(const struct dentry *dentry, struct qstr *str);extern int generic_ci_d_compare (const struct dentry *dentry,unsigned int len,const char *str,const struct qstr *name);#endif +extern void generic_set_encrypted_ci_d_ops (struct dentry *dentry);#ifdef CONFIG_MIGRATION extern int buffer_migrate_page(struct address_space *,
Signature · 1 line
2.29.2.299.gdc1121823c-goog
Re: [PATCH v2 1/3] libfs: Add generic function for setting dentry_ops
Quoted 7 lines · Daniel Rosenberg
This adds a function to set dentry operations at lookup time that will work for both encrypted filenames and casefolded filenames.
A filesystem that supports both features simultaneously can use this function during lookup preparations to set up its dentry operations once fscrypt no longer does that itself.
Quoted 6 lines
Currently the casefolding dentry operation are always set if the filesystem defines an encoding because the features is toggleable on empty directories. Since we don't know what set of functions we'll eventually need, and cannot change them later, we add just add them.
Signed-off-by Daniel Rosenberg <[email protected]>
- Ted
Eric Biggers
maintainerRe: [PATCH v2 1/3] libfs: Add generic function for setting dentry_ops
In reply to Daniel RosenbergQuoted 5 lines · Daniel Rosenberg
Currently the casefolding dentry operation are always set if the filesystem defines an encoding because the features is toggleable on empty directories. Since we don't know what set of functions we'll eventually need, and cannot change them later, we add just add them.
This isn't a very useful explanation, since encryption can be toggled on empty directories too (at least from off to on --- not the other way). Why is casefolding different?
Quoted 22 lines
fs/libfs.c +21
-0+static const struct dentry_operations generic_ci_dentry_ops = { + .d_hash = generic_ci_d_hash, + .d_compare = generic_ci_d_compare, +};#endif + +#ifdef CONFIG_FS_ENCRYPTION +static const struct dentry_operations generic_encrypted_dentry_ops = { + .d_revalidate = fscrypt_d_revalidate, +}; +#endif + +#if IS_ENABLED (CONFIG_UNICODE ) &&IS_ENABLED (CONFIG_FS_ENCRYPTION ) +static const struct dentry_operations generic_encrypted_ci_dentry_ops = { + .d_hash = generic_ci_d_hash, + .d_compare = generic_ci_d_compare, + .d_revalidate = fscrypt_d_revalidate, +}; +#endif + +/** +* generic_set_encrypted_ci_d_ops - helper for setting d_ops for given dentry
fs/libfs.c int generic_ci_d_hash(const struct dentry *dentry, struct qstr *str) · line 1484
Quoted 10 lines
fs/libfs.c +10
-0+* @dentry: dentry to set ops on +* +* This function sets the dentry ops for the given dentry to handle both +* casefolded and encrypted dentry names. +* +* Encryption requires d_revalidate to remove nokey names once the key is present. +* Casefolding is toggleable on an empty directory. Since we can't change the +* operations later on, we just add the casefolding ops if the filesystem defines an +* encoding. +*/
There are some overly long lines here (> 80 columns).
But more importantly this still isn't a good explanation. Encryption can also be enabled on empty directories; what makes casefolding different?
It's also not obvious why so many different copies of the dentry operations needed, instead of just using generic_encrypted_ci_dentry_ops on all.
If I'm still struggling to understand this after following these patches for a long time, I expect everyone else will have trouble too...
Here's a suggestion which I think explains it a lot better. It's still possible I'm misunderstanding something, though, so please check it carefully:
/**
* generic_set_encrypted_ci_d_ops - helper for setting d_ops for given dentry
* @dentry: dentry to set ops on
*
* Casefolded directories need d_hash and d_compare set, so that the dentries
* contained in them are handled case-insensitively. Note that these operations
* are needed on the parent directory rather than on the dentries in it, and the
* casefolding flag can be enabled on an empty directory later but the
* dentry_operations can't be changed later. As a result, if the filesystem has
* casefolding support enabled at all, we have to give all dentries the
* casefolding operations even if their inode doesn't have the casefolding flag
* currently (and thus the casefolding ops would be no-ops for now). *
* Encryption works differently in that the only dentry operation it needs is
* d_revalidate, which it only needs on dentries that have the no-key name flag.
* The no-key flag can't be set "later", so we don't have to worry about that. *
* Finally, to maximize compatibility with overlayfs (which isn't compatible
* with certain dentry operations) and to avoid taking an unnecessary
* performance hit, we use custom dentry_operations for each possible
* combination rather always installing all operations.
*/
fs/libfs.c int generic_ci_d_hash(const struct dentry *dentry, struct qstr *str) · line 1497
Quoted 13 lines
fs/libfs.c +13
-0+void generic_set_encrypted_ci_d_ops (struct dentry *dentry) +{ +#ifdef CONFIG_FS_ENCRYPTION +bool needs_encrypt_ops = dentry->d_flags &DCACHE_NOKEY_NAME ; +#endif +#ifdef CONFIG_UNICODE +bool needs_ci_ops = dentry->d_sb->s_encoding; +#endif +#if defined(CONFIG_FS_ENCRYPTION ) && defined(CONFIG_UNICODE ) +if (needs_encrypt_ops && needs_ci_ops) { +d_set_d_op (dentry, &generic_encrypted_ci_dentry_ops); +return ; + }
The return statement above has the wrong indentation level.
Quoted 20 lines
fs/libfs.c +15
-0+#endif +#ifdef CONFIG_FS_ENCRYPTION +if (needs_encrypt_ops) { +d_set_d_op (dentry, &generic_encrypted_dentry_ops); +return ; + } +#endif +#ifdef CONFIG_UNICODE +if (needs_ci_ops) { +d_set_d_op (dentry, &generic_ci_dentry_ops); +return ; + } +#endif +} +EXPORT_SYMBOL (generic_set_encrypted_ci_d_ops);include/linux/fs.h +0
-0
include/linux/fs.h extern int generic_ci_d_hash(const struct dentry *dentry, struct qstr *str); · line 3208
Quoted 7 lines
include/linux/fs.h +1
-0@@ -3202,6 +3202,7 @@ extern int generic_ci_d_hash(const struct dentry *dentry, struct qstr *str);extern int generic_ci_d_compare (const struct dentry *dentry,unsigned int len,const char *str,const struct qstr *name);#endif +extern void generic_set_encrypted_ci_d_ops (struct dentry *dentry);#ifdef CONFIG_MIGRATION extern int buffer_migrate_page(struct address_space *,
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Eric Biggers
maintainerRe: [f2fs-dev] [PATCH v2 1/3] libfs: Add generic function for setting dentry_ops
Quoted 18 lines · Eric Biggers
Here's a suggestion which I think explains it a lot better. It's still possible I'm misunderstanding something, though, so please check it carefully:
/**
*generic_set_encrypted_ci_d_ops- helper for settingd_opsfor given dentry
* @dentry: dentry to set ops on
*
* Casefolded directories needd_hashandd_compareset, so that the dentries
* contained in them are handled case-insensitively. Note that these operations
* are needed on the parent directory rather than on the dentries in it, and the
* casefolding flag can be enabled on an empty directory later but the
*dentry_operationscan't be changed later. As a result, if the filesystem has
* casefolding support enabled at all, we have to give all dentries the
* casefolding operations even if their inode doesn't have the casefolding flag
* currently (and thus the casefolding ops would be no-ops for now). *
* Encryption works differently in that the only dentry operation it needs is
Quoted 8 lines
*
d_revalidate, which it only needs on dentries that have the no-key name flag.
* The no-key flag can't be set "later", so we don't have to worry about that. *
* Finally, to maximize compatibility with overlayfs (which isn't compatible
* with certain dentry operations) and to avoid taking an unnecessary
* performance hit, we use customdentry_operationsfor each possible
* combination rather always installing all operations.
*/
Last line in my suggestion has a typo: "rather" => "rather than".
- Eric
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
PATCH v2 2/3 fscrypt: Have filesystems handle their d_ops
In reply to Daniel RosenbergThis shifts the responsibility of setting up dentry operations from fscrypt to the individual filesystems, allowing them to have their own operations while still setting fscrypt's d_revalidate as appropriate.
Most filesystems can just use generic_set_encrypted_ci_d_ops, unless they have their own specific dentry operations as well. That operation will set the minimal d_ops required under the circumstances.
Since the fscrypt d_ops are set later on, we must set all d_ops there, since we cannot adjust those later on. This should not result in any change in behavior.
--- fs/crypto/fname.c | 4 ---- fs/crypto/hooks.c | 1 - fs/ext4/dir.c | 7 ------- fs/ext4/ext4.h | 4 ---- fs/ext4/namei.c | 1 + fs/ext4/super.c | 5 ----- fs/f2fs/dir.c | 7 ------- fs/f2fs/f2fs.h | 3 --- fs/f2fs/namei.c | 1 + fs/f2fs/super.c | 1 - fs/ubifs/dir.c | 1 + include/linux/fscrypt.h | 5 +++-- 12 files changed, 6 insertions(+), 34 deletions(-)
fs/crypto/fname.c +0 -4
@@ -570,7 +570,3 @@ int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags)return valid; }EXPORT_SYMBOL_GPL (fscrypt_d_revalidate); - -const struct dentry_operations fscrypt_d_ops = { - .d_revalidate = fscrypt_d_revalidate, -};
fs/crypto/hooks.c +0 -1
@@ -117,7 +117,6 @@ int __fscrypt_prepare_lookup(struct inode *dir, struct dentry *dentry,spin_lock (&dentry->d_lock); dentry->d_flags |=DCACHE_NOKEY_NAME ;spin_unlock (&dentry->d_lock); -d_set_d_op (dentry, &fscrypt_d_ops); }return err; }
fs/ext4/dir.c +0 -7
@@ -667,10 +667,3 @@ const struct file_operations ext4_dir_operations = { .open = ext4_dir_open, .release = ext4_release_dir, }; - -#ifdef CONFIG_UNICODE -const struct dentry_operations ext4_dentry_ops = { - .d_hash = generic_ci_d_hash, - .d_compare = generic_ci_d_compare, -}; -#endif
fs/ext4/ext4.h +0 -4
@@ -3380,10 +3380,6 @@ static inline void ext4_unlock_group(struct super_block *sb,/* dir.c */ extern const struct file_operations ext4_dir_operations; -#ifdef CONFIG_UNICODE -extern const struct dentry_operations ext4_dentry_ops; -#endif -/* file.c */ extern const struct inode_operations ext4_file_inode_operations;extern const struct file_operations ext4_file_operations;
fs/ext4/namei.c +1 -0
@@ -1614,6 +1614,7 @@ static struct buffer_head *ext4_lookup_entry(struct inode *dir,struct buffer_head *bh; err =ext4_fname_prepare_lookup (dir, dentry, &fname); +generic_set_encrypted_ci_d_ops (dentry);if (err == -ENOENT )return NULL ;if (err)
fs/ext4/super.c +0 -5
@@ -4968,11 +4968,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) goto failed_mount4; } -#ifdef CONFIG_UNICODE -if (sb->s_encoding) - sb->s_d_op = &ext4_dentry_ops; -#endif - sb->s_root =d_make_root (root);if (!sb->s_root) {ext4_msg (sb,KERN_ERR ,"get root dentry failed" );
fs/f2fs/dir.c +0 -7
@@ -1099,10 +1099,3 @@ const struct file_operations f2fs_dir_operations = { .compat_ioctl = f2fs_compat_ioctl,#endif }; - -#ifdef CONFIG_UNICODE -const struct dentry_operations f2fs_dentry_ops = { - .d_hash = generic_ci_d_hash, - .d_compare = generic_ci_d_compare, -}; -#endif
fs/f2fs/f2fs.h +0 -3
@@ -3767,9 +3767,6 @@ static inline void f2fs_update_sit_info(struct f2fs_sb_info *sbi) {}#endif extern const struct file_operations f2fs_dir_operations; -#ifdef CONFIG_UNICODE -extern const struct dentry_operations f2fs_dentry_ops; -#endif extern const struct file_operations f2fs_file_operations;extern const struct inode_operations f2fs_file_inode_operations;extern const struct address_space_operations f2fs_dblock_aops;
fs/f2fs/namei.c +1 -0
@@ -497,6 +497,7 @@ static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry, } err =f2fs_prepare_lookup (dir, dentry, &fname); +generic_set_encrypted_ci_d_ops (dentry);if (err == -ENOENT ) goto out_splice;if (err)
fs/f2fs/super.c +0 -1
@@ -3427,7 +3427,6 @@ static int f2fs_setup_casefold(struct f2fs_sb_info *sbi) sbi->sb->s_encoding = encoding; sbi->sb->s_encoding_flags = encoding_flags; - sbi->sb->s_d_op = &f2fs_dentry_ops; }#else if (f2fs_sb_has_casefold (sbi)) {
fs/ubifs/dir.c +1 -0
@@ -203,6 +203,7 @@ static struct dentry *ubifs_lookup(struct inode *dir, struct dentry *dentry,dbg_gen ("'%pd' in dir ino %lu" , dentry, dir->i_ino); err =fscrypt_prepare_lookup (dir, dentry, &nm); +generic_set_encrypted_ci_d_ops (dentry);if (err == -ENOENT )return d_splice_alias (NULL , dentry);if (err)
include/linux/fscrypt.h +3 -2
@@ -741,8 +741,9 @@ static inline int fscrypt_prepare_rename(struct inode *old_dir,* directory's encryption key is available, then the lookup is assumed to be by * plaintext name; otherwise, it is assumed to be by no-key name. * -* This also installs a custom ->d_revalidate() method which will invalidate the -* dentry if it was created without the key and the key is later added. +* After calling this function, a filesystem should ensure that its dentry +* operations contain fscrypt_d_revalidate if DCACHE_ENCRYPTED_NAME was set, +* so that the dentry can be invalidated if the key is later added. * * Return: 0 on success; -ENOENT if the directory's key is unavailable but the * filename isn't a valid no-key name, so a negative dentry should be created;
Signature · 1 line
2.29.2.299.gdc1121823c-goog
Re: [PATCH v2 2/3] fscrypt: Have filesystems handle their d_ops
Quoted 8 lines · Daniel Rosenberg
This shifts the responsibility of setting up dentry operations from fscrypt to the individual filesystems, allowing them to have their own operations while still setting fscrypt's
d_revalidateas appropriate.Most filesystems can just use
generic_set_encrypted_ci_d_ops, unless they have their own specific dentry operations as well. That operation will set the minimald_opsrequired under the circumstances.
Quoted 5 lines
Since the fscrypt
d_opsare set later on, we must set alld_opsthere, since we cannot adjust those later on. This should not result in any change in behavior.Signed-off-by Daniel Rosenberg <[email protected]>
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Jaegeuk Kim
maintainerRe: [PATCH v2 2/3] fscrypt: Have filesystems handle their d_ops
Quoted 9 lines · Theodore Y. Ts'o
Quoted 8 lines · Daniel Rosenberg
This shifts the responsibility of setting up dentry operations from fscrypt to the individual filesystems, allowing them to have their own operations while still setting fscrypt's
d_revalidateas appropriate.Most filesystems can just use
generic_set_encrypted_ci_d_ops, unless they have their own specific dentry operations as well. That operation will set the minimald_opsrequired under the circumstances.
Quoted 7 lines
Quoted 5 lines
Since the fscrypt
d_opsare set later on, we must set alld_opsthere, since we cannot adjust those later on. This should not result in any change in behavior.Signed-off-by Daniel Rosenberg <[email protected]>Acked-by Theodore Ts'o <[email protected]>
Hi Ted/Richard,
I'd like to pick this patch series in f2fs/dev for -next, so please let me know if you have any concern.
Thanks,
Theodore Y. Ts'o
maintainerRe: [PATCH v2 2/3] fscrypt: Have filesystems handle their d_ops
Quoted 3 lines · Jaegeuk Kim
I'd like to pick this patch series in f2fs/dev for -next, so please let me know if you have any concern.
No concern for me as far as ext4 is concerned, thanks!
- Ted
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Eric Biggers
maintainerRe: [PATCH v2 2/3] fscrypt: Have filesystems handle their d_ops
In reply to Daniel RosenbergQuoted 6 lines · Daniel Rosenberg
include/linux/fscrypt.h +0
-0@@ -741,8 +741,9 @@ static inline int fscrypt_prepare_rename(struct inode *old_dir,* directory's encryption key is available, then the lookup is assumed to be by
include/linux/fscrypt.h static inline int fscrypt_prepare_rename(struct inode *old_dir, · line 749
Quoted 10 lines
include/linux/fscrypt.h +3
-2* plaintext name; otherwise, it is assumed to be by no-key name. * -* This also installs a custom ->d_revalidate() method which will invalidate the -* dentry if it was created without the key and the key is later added. +* After calling this function, a filesystem should ensure that its dentry +* operations contain fscrypt_d_revalidate if DCACHE_ENCRYPTED_NAME was set, +* so that the dentry can be invalidated if the key is later added. * * Return: 0 on success; -ENOENT if the directory's key is unavailable but the * filename isn't a valid no-key name, so a negative dentry should be created;
This should say DCACHE_NOKEY_NAME, not DCACHE_ENCRYPTED_NAME.
But more importantly, the explanation here isn't very clear. How about the following instead:
* This will set DCACHE_NOKEY_NAME on the dentry if the lookup is by no-key
* name. In this case the filesystem must assign the dentry a dentry_operations
* which contains fscrypt_d_revalidate (or contains a d_revalidate method that
* calls fscrypt_d_revalidate), so that the dentry will be invalidated if the
* directory's encryption key is later added.
PATCH v2 3/3 f2fs: Handle casefolding with Encryption
In reply to Daniel RosenbergExpand f2fs's casefolding support to include encrypted directories. To index casefolded+encrypted directories, we use the SipHash of the casefolded name, keyed by a key derived from the directory's fscrypt master key. This ensures that the dirhash doesn't leak information about the plaintext filenames.
Encryption keys are unavailable during roll-forward recovery, so we can't compute the dirhash when recovering a new dentry in an encrypted + casefolded directory. To avoid having to force a checkpoint when a new file is fsync'ed, store the dirhash on-disk appended to i_name.
This patch incorporates work by Eric Biggers <[email protected]> and Jaegeuk Kim <[email protected]>.
--- fs/f2fs/dir.c | 89 +++++++++++++++++++++++++++++++++++++--------- fs/f2fs/f2fs.h | 8 +++-- fs/f2fs/hash.c | 11 +++++- fs/f2fs/inline.c | 4 +++ fs/f2fs/recovery.c | 12 ++++++- fs/f2fs/super.c | 6 ---- 6 files changed, 103 insertions(+), 27 deletions(-)
fs/f2fs/dir.c +73 -16
@@ -5,6 +5,7 @@* Copyright (c) 2012 Samsung Electronics Co., Ltd. * http://www.samsung.com/ */ +#include <asm/unaligned.h> #include <linux/fs.h> #include <linux/f2fs_fs.h> #include <linux/sched/signal.h>
@@ -195,26 +196,53 @@ static struct f2fs_dir_entry *find_in_block(struct inode *dir, {struct f2fs_dentry_block *dentry_blk;struct f2fs_dentry_ptr d; +struct f2fs_dir_entry *res; dentry_blk = (struct f2fs_dentry_block *)page_address (dentry_page);make_dentry_ptr_block (dir, &d, dentry_blk); -return f2fs_find_target_dentry (&d, fname, max_slots); + res =f2fs_find_target_dentry (&d, fname, max_slots); +if (IS_ERR (res)) { + dentry_page =ERR_CAST (res); + res =NULL ; + } +return res; }#ifdef CONFIG_UNICODE /* * Test whether a case-insensitive directory entry matches the filename * being searched for. +* +* Returns 1 for a match, 0 for no match, and -errno on an error. */ -static bool f2fs_match_ci_name (const struct inode *dir,const struct qstr *name, +static int f2fs_match_ci_name (const struct inode *dir,const struct qstr *name,const u8 *de_name,u32 de_name_len) {const struct super_block *sb = dir->i_sb;const struct unicode_map *um = sb->s_encoding; +struct fscrypt_str decrypted_name =FSTR_INIT (NULL , de_name_len);struct qstr entry =QSTR_INIT (de_name, de_name_len);int res; +if (IS_ENCRYPTED (dir)) { +const struct fscrypt_str encrypted_name = +FSTR_INIT ((u8 *)de_name, de_name_len); + +if (WARN_ON_ONCE (!fscrypt_has_encryption_key (dir))) +return -EINVAL ; + + decrypted_name.name =kmalloc (de_name_len,GFP_KERNEL ); +if (!decrypted_name.name) +return -ENOMEM ; + res =fscrypt_fname_disk_to_usr (dir,0 ,0 , &encrypted_name, + &decrypted_name); +if (res <0 ) + goto out; + entry.name = decrypted_name.name; + entry.len = decrypted_name.len; + } + res =utf8_strncasecmp_folded (um, name, &entry);if (res <0 ) {/*
@@ -222,14 +250,20 @@ static bool f2fs_match_ci_name(const struct inode *dir, const struct qstr *name,* fall back to treating them as opaque byte sequences. */ if (sb_has_strict_encoding (sb) || name->len != entry.len) -return false; - return !memcmp(name->name, entry.name, name->len); + res =0 ; +else + res = memcmp(name->name, entry.name, name->len) == 0; + }else { +/* utf8_strncasecmp_folded returns 0 on match */ + res = (res ==0 ); } -return res ==0 ; +out: +kfree (decrypted_name.name); +return res; }#endif /* CONFIG_UNICODE */ -static inline bool f2fs_match_name (const struct inode *dir, +static inline int f2fs_match_name (const struct inode *dir,const struct f2fs_filename *fname,const u8 *de_name,u32 de_name_len) {
@@ -256,6 +290,7 @@ struct f2fs_dir_entry *f2fs_find_target_dentry(const struct f2fs_dentry_ptr *d,struct f2fs_dir_entry *de;unsigned long bit_pos =0 ;int max_len =0 ; +int res =0 ;if (max_slots) *max_slots =0 ;
@@ -273,10 +308,14 @@ struct f2fs_dir_entry *f2fs_find_target_dentry(const struct f2fs_dentry_ptr *d,continue ; } -if (de->hash_code == fname->hash && -f2fs_match_name (d->inode, fname, d->filename[bit_pos], -le16_to_cpu (de->name_len))) - goto found; +if (de->hash_code == fname->hash) { + res =f2fs_match_name (d->inode, fname, d->filename[bit_pos], +le16_to_cpu (de->name_len)); +if (res <0 ) +return ERR_PTR (res); +else if (res) + goto found; + }if (max_slots && max_len > *max_slots) *max_slots = max_len;
@@ -448,17 +487,39 @@ void f2fs_set_link(struct inode *dir, struct f2fs_dir_entry *de,f2fs_put_page (page,1 ); } -static void init_dent_inode (const struct f2fs_filename *fname, +static void init_dent_inode (struct inode *dir,struct inode *inode, +const struct f2fs_filename *fname,struct page *ipage) {struct f2fs_inode *ri; +if (!fname)/* tmpfile case? */ +return ; +f2fs_wait_on_page_writeback (ipage,NODE , true, true);/* copy name info. to this inode page */ ri =F2FS_INODE (ipage); ri->i_namelen =cpu_to_le32 (fname->disk_name.len);memcpy (ri->i_name, fname->disk_name.name, fname->disk_name.len); +if (IS_ENCRYPTED (dir)) { +file_set_enc_name (inode); +/* +* Roll-forward recovery doesn't have encryption keys available, +* so it can't compute the dirhash for encrypted+casefolded +* filenames. Append it to i_name if possible. Else, disable +* roll-forward recovery of the dentry (i.e., make fsync'ing the +* file force a checkpoint) by setting LOST_PINO. +*/ +if (IS_CASEFOLDED (dir)) { +if (fname->disk_name.len +sizeof (f2fs_hash_t) <= +F2FS_NAME_LEN ) +put_unaligned (fname->hash, (f2fs_hash_t *) + &ri->i_name[fname->disk_name.len]); +else +file_lost_pino (inode); + } + }set_page_dirty (ipage); }
@@ -541,11 +602,7 @@ struct page *f2fs_init_inode_metadata(struct inode *inode, struct inode *dir,return page; } -if (fname) { -init_dent_inode (fname, page); -if (IS_ENCRYPTED (dir)) -file_set_enc_name (inode); - } +init_dent_inode (dir, inode, fname, page);/* * This file should be checkpointed during fsync.
fs/f2fs/f2fs.h +5 -3
@@ -533,9 +533,11 @@ struct f2fs_filename {#ifdef CONFIG_UNICODE /* * For casefolded directories: the casefolded name, but it's left NULL -* if the original name is not valid Unicode or if the filesystem is -* doing an internal operation where usr_fname is also NULL. In these -* cases we fall back to treating the name as an opaque byte sequence. +* if the original name is not valid Unicode, if the directory is both +* casefolded and encrypted and its encryption key is unavailable, or if +* the filesystem is doing an internal operation where usr_fname is also +* NULL. In all these cases we fall back to treating the name as an +* opaque byte sequence. */ struct fscrypt_str cf_name;#endif
fs/f2fs/hash.c +10 -1
@@ -111,7 +111,9 @@ void f2fs_hash_filename(const struct inode *dir, struct f2fs_filename *fname)* If the casefolded name is provided, hash it instead of the * on-disk name. If the casefolded name is *not* provided, that * should only be because the name wasn't valid Unicode, so fall -* back to treating the name as an opaque byte sequence. +* back to treating the name as an opaque byte sequence. Note +* that to handle encrypted directories, the fallback must use +* usr_fname (plaintext) rather than disk_name (ciphertext). */ WARN_ON_ONCE (!fname->usr_fname->name);if (fname->cf_name.name) {
@@ -121,6 +123,13 @@ void f2fs_hash_filename(const struct inode *dir, struct f2fs_filename *fname) name = fname->usr_fname->name; len = fname->usr_fname->len; } +if (IS_ENCRYPTED (dir)) { +struct qstr tmp =QSTR_INIT (name, len); + + fname->hash = +cpu_to_le32 (fscrypt_fname_siphash (dir, &tmp)); +return ; + } }#endif fname->hash =cpu_to_le32 (TEA_hash_name (name, len));
fs/f2fs/inline.c +4 -0
@@ -332,6 +332,10 @@ struct f2fs_dir_entry *f2fs_find_in_inline_dir(struct inode *dir,make_dentry_ptr_inline (dir, &d, inline_dentry); de =f2fs_find_target_dentry (&d, fname,NULL );unlock_page (ipage); +if (IS_ERR (de)) { + *res_page =ERR_CAST (de); + de =NULL ; + }if (de) *res_page = ipage;else
fs/f2fs/recovery.c +11 -1
@@ -5,6 +5,7 @@* Copyright (c) 2012 Samsung Electronics Co., Ltd. * http://www.samsung.com/ */ +#include <asm/unaligned.h> #include <linux/fs.h> #include <linux/f2fs_fs.h> #include "f2fs.h"
@@ -128,7 +129,16 @@ static int init_recovered_filename(const struct inode *dir, }/* Compute the hash of the filename */ -if (IS_CASEFOLDED (dir)) { +if (IS_ENCRYPTED (dir) &&IS_CASEFOLDED (dir)) { +/* +* In this case the hash isn't computable without the key, so it +* was saved on-disk. +*/ +if (fname->disk_name.len +sizeof (f2fs_hash_t) >F2FS_NAME_LEN ) +return -EINVAL ; + fname->hash =get_unaligned ((f2fs_hash_t *) + &raw_inode->i_name[fname->disk_name.len]); + }else if (IS_CASEFOLDED (dir)) { err =f2fs_init_casefolded_name (dir, fname);if (err)return err;
fs/f2fs/super.c +0 -6
@@ -3399,12 +3399,6 @@ static int f2fs_setup_casefold(struct f2fs_sb_info *sbi)struct unicode_map *encoding;__u16 encoding_flags; -if (f2fs_sb_has_encrypt (sbi)) { -f2fs_err (sbi, -"Can't mount with encoding and encryption" ); -return -EINVAL ; - } -if (f2fs_sb_read_encoding (sbi->raw_super, &encoding_info, &encoding_flags)) { f2fs_err(sbi,
Signature · 1 line
2.29.2.299.gdc1121823c-goog
Re: [PATCH v2 3/3] f2fs: Handle casefolding with Encryption
Hi Daniel,
url: https://github.com/0day-ci/linux/commits/Daniel-Rosenberg/Add-support-for-Encryption-and-Casefolding-in-F2FS/20201117-120753 base: https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git dev-test compiler: aarch64-linux-gcc (GCC) 9.3.0
If you fix the issue, kindly add following tag as appropriate
cppcheck possible warnings: (new ones prefixed by >>, may not real problems)
Quoted 1 line
Quoted 1 line
fs/f2fs/dir.c:206:3: warning: Assignment of function parameter has no effect outside the function. Did you forget dereferencing it? [uselessAssignmentPtrArg]
dentry_page = ERR_CAST(res);
^
fs/f2fs/f2fs.h:2200:15: warning: Local variable valid_node_count shadows outer function [shadowFunction]
unsigned int valid_node_count, user_block_count;
^
fs/f2fs/f2fs.h:2296:28: note: Shadowed declaration
static inline unsigned int valid_node_count(struct f2fs_sb_info *sbi)
^
fs/f2fs/f2fs.h:2200:15: note: Shadow variable
unsigned int valid_node_count, user_block_count;
^vim +206 fs/f2fs/dir.c
2c2eb7a300cd7c6 Daniel Rosenberg 2019-07-23 192 static struct f2fs_dir_entry *find_in_block(struct inode *dir,
2c2eb7a300cd7c6 Daniel Rosenberg 2019-07-23 193 struct page *dentry_page,
43c780ba26244e4 Eric Biggers 2020-05-07 194 const struct f2fs_filename *fname,
17f930e0a649e15 Chao Yu 2020-09-26 195 int *max_slots)
4e6ebf6d4935914 Jaegeuk Kim 2014-10-13 196 {
4e6ebf6d4935914 Jaegeuk Kim 2014-10-13 197 struct f2fs_dentry_block *dentry_blk;
7b3cd7d6f026784 Jaegeuk Kim 2014-10-18 198 struct f2fs_dentry_ptr d;
6f0a1d1d8d24e7e Daniel Rosenberg 2020-11-17 199 struct f2fs_dir_entry *res;
4e6ebf6d4935914 Jaegeuk Kim 2014-10-13 200
bdbc90fa55af632 Yunlong Song 2018-02-28 201 dentry_blk = (struct f2fs_dentry_block *)page_address(dentry_page);
7b3cd7d6f026784 Jaegeuk Kim 2014-10-18 202
2c2eb7a300cd7c6 Daniel Rosenberg 2019-07-23 203 make_dentry_ptr_block(dir, &d, dentry_blk);
6f0a1d1d8d24e7e Daniel Rosenberg 2020-11-17 204 res = f2fs_find_target_dentry(&d, fname, max_slots);
6f0a1d1d8d24e7e Daniel Rosenberg 2020-11-17 205 if (IS_ERR(res)) {
6f0a1d1d8d24e7e Daniel Rosenberg 2020-11-17 @206 dentry_page = ERR_CAST(res);
^^^^^^^^^^^^^^^^^^^^^^^^^^^^6f0a1d1d8d24e7e Daniel Rosenberg 2020-11-17 207 res = NULL; 6f0a1d1d8d24e7e Daniel Rosenberg 2020-11-17 208 } 6f0a1d1d8d24e7e Daniel Rosenberg 2020-11-17 209 return res; 4e6ebf6d4935914 Jaegeuk Kim 2014-10-13 210 }
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
_______________________________________________
kbuild mailing list -- kbuild(a)lists.01.org
To unsubscribe send an email to kbuild-leave(a)lists.01.org
Eric Biggers
maintainerRe: [PATCH v2 3/3] f2fs: Handle casefolding with Encryption
In reply to Daniel RosenbergQuoted 45 lines · Daniel Rosenberg
Expand f2fs's casefolding support to include encrypted directories. To index casefolded+encrypted directories, we use the SipHash of the casefolded name, keyed by a key derived from the directory's fscrypt master key. This ensures that the dirhash doesn't leak information about the plaintext filenames.
Encryption keys are unavailable during roll-forward recovery, so we can't compute the dirhash when recovering a new dentry in an encrypted + casefolded directory. To avoid having to force a checkpoint when a new file is fsync'ed, store the dirhash on-disk appended to
i_name.This patch incorporates work by Eric Biggers <[email protected]> and Jaegeuk Kim <[email protected]>.
Co-developed-by Eric Biggers <[email protected]>Signed-off-by Eric Biggers <[email protected]>Signed-off-by Daniel Rosenberg <[email protected]>--- fs/f2fs/dir.c | 89 +++++++++++++++++++++++++++++++++++++--------- fs/f2fs/f2fs.h | 8 +++-- fs/f2fs/hash.c | 11 +++++- fs/f2fs/inline.c | 4 +++ fs/f2fs/recovery.c | 12 ++++++- fs/f2fs/super.c | 6 ---- 6 files changed, 103 insertions(+), 27 deletions(-)fs/f2fs/dir.c +2
-0@@ -5,6 +5,7 @@* Copyright (c) 2012 Samsung Electronics Co., Ltd. * http://www.samsung.com/ */ +#include <asm/unaligned.h> #include <linux/fs.h> #include <linux/f2fs_fs.h> #include <linux/sched/signal.h> @@ -195,26 +196,53 @@ static struct f2fs_dir_entry *find_in_block(struct inode *dir, {struct f2fs_dentry_block *dentry_blk;struct f2fs_dentry_ptr d; +struct f2fs_dir_entry *res; dentry_blk = (struct f2fs_dentry_block *)page_address (dentry_page);
fs/f2fs/dir.c static struct f2fs_dir_entry *find_in_block(struct inode *dir, · line 210
Quoted 10 lines
fs/f2fs/dir.c +6
-1make_dentry_ptr_block (dir, &d, dentry_blk); -return f2fs_find_target_dentry (&d, fname, max_slots); + res =f2fs_find_target_dentry (&d, fname, max_slots); +if (IS_ERR (res)) { + dentry_page =ERR_CAST (res); + res =NULL ; + } +return res; }
What is the assignment to dentry_page supposed to be accomplishing? It looks like it's meant to pass up errors from f2fs_find_target_dentry(), but it doesn't do that.
fs/f2fs/dir.c static bool f2fs_match_ci_name(const struct inode *dir, const struct qstr *name, · line 259
Quoted 13 lines
fs/f2fs/dir.c +6
-2@@ -222,14 +250,20 @@ static bool f2fs_match_ci_name(const struct inode *dir, const struct qstr *name,* fall back to treating them as opaque byte sequences. */ if (sb_has_strict_encoding (sb) || name->len != entry.len) -return false; -return !memcmp (name->name, entry.name, name->len); + res =0 ; +else + res =memcmp (name->name, entry.name, name->len) ==0 ; + }else { +/* utf8_strncasecmp_folded returns 0 on match */ + res = (res ==0 ); }
The following might be easier to understand:
/*
* In strict mode, ignore invalid names. In non-strict mode, fall back
* to treating them as opaque byte sequences.
*/
if (res < 0 && !sb_has_strict_encoding(sb)) {
res = name->len == entry.len &&
memcmp(name->name, entry.name, name->len) == 0;
} else {
/* utf8_strncasecmp_folded returns 0 on match */
res = (res == 0);
}Quoted 6 lines
fs/f2fs/dir.c +0
-2@@ -273,10 +308,14 @@ struct f2fs_dir_entry *f2fs_find_target_dentry(const struct f2fs_dentry_ptr *d,continue ; } -if (de->hash_code == fname->hash && - f2fs_match_name(d->inode, fname, d->filename[bit_pos],
fs/f2fs/dir.c struct f2fs_dir_entry *f2fs_find_target_dentry(const struct f2fs_dentry_ptr *d, · line 318
Quoted 10 lines
fs/f2fs/dir.c +8
-2- le16_to_cpu(de->name_len))) - goto found; +if (de->hash_code == fname->hash) { + res =f2fs_match_name (d->inode, fname, d->filename[bit_pos], +le16_to_cpu (de->name_len)); +if (res <0 ) +return ERR_PTR (res); +else if (res) + goto found; + }
Overly long line here. Also 'else if' is unnecessary, just use 'if'.
- Eric
Re: [PATCH v2 3/3] f2fs: Handle casefolding with Encryption
Quoted 5 lines · Eric Biggers
What is the assignment to
dentry_pagesupposed to be accomplishing? It looks like it's meant to pass up errors fromf2fs_find_target_dentry(), but it doesn't do that.
Woops. Fixed that for the next version.
Quoted 17 lines
Quoted 4 lines
fs/f2fs/dir.c +0
-0@@ -222,14 +250,20 @@ static bool f2fs_match_ci_name(const struct inode *dir, const struct qstr *name,* fall back to treating them as opaque byte sequences. */ fs/f2fs/dir.c static bool f2fs_match_ci_name(const struct inode *dir, const struct qstr *name, · line 259
Quoted 10 lines
fs/f2fs/dir.c +6
-2if (sb_has_strict_encoding (sb) || name->len != entry.len) -return false; -return !memcmp (name->name, entry.name, name->len); + res =0 ; +else + res =memcmp (name->name, entry.name, name->len) ==0 ; + }else { +/* utf8_strncasecmp_folded returns 0 on match */ + res = (res ==0 ); }The following might be easier to understand:
Quoted 12 lines
/*
* In strict mode, ignore invalid names. In non-strict mode, fall back
* to treating them as opaque byte sequences.
*/
if (res < 0 && !sb_has_strict_encoding(sb)) {
res = name->len == entry.len &&
memcmp(name->name, entry.name, name->len) == 0;
} else {
/* utf8_strncasecmp_folded returns 0 on match */
res = (res == 0);
}Thanks, that is a fair bit nicer.
Quoted 19 lines
Quoted 6 lines
fs/f2fs/dir.c +0
-2@@ -273,10 +308,14 @@ struct f2fs_dir_entry *f2fs_find_target_dentry(const struct f2fs_dentry_ptr *d,continue ; } -if (de->hash_code == fname->hash && - f2fs_match_name(d->inode, fname, d->filename[bit_pos],fs/f2fs/dir.c struct f2fs_dir_entry *f2fs_find_target_dentry(const struct f2fs_dentry_ptr *d, · line 318
Quoted 10 lines
fs/f2fs/dir.c +8
-2- le16_to_cpu(de->name_len))) - goto found; +if (de->hash_code == fname->hash) { + res =f2fs_match_name (d->inode, fname, d->filename[bit_pos], +le16_to_cpu (de->name_len)); +if (res <0 ) +return ERR_PTR (res); +else if (res) + goto found; + }Overly long line here. Also 'else if' is unnecessary, just use 'if'.
Quoted 1 line
- Eric
The 0 case is important, since that reflects that the name was not found. -Daniel
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Eric Biggers
maintainerRe: [PATCH v2 3/3] f2fs: Handle casefolding with Encryption
Quoted 19 lines · Daniel Rosenberg
Quoted 19 lines
Quoted 6 lines
fs/f2fs/dir.c +0
-2@@ -273,10 +308,14 @@ struct f2fs_dir_entry *f2fs_find_target_dentry(const struct f2fs_dentry_ptr *d,continue ; } -if (de->hash_code == fname->hash && - f2fs_match_name(d->inode, fname, d->filename[bit_pos],fs/f2fs/dir.c struct f2fs_dir_entry *f2fs_find_target_dentry(const struct f2fs_dentry_ptr *d, · line 318
Quoted 10 lines
fs/f2fs/dir.c +8
-2- le16_to_cpu(de->name_len))) - goto found; +if (de->hash_code == fname->hash) { + res =f2fs_match_name (d->inode, fname, d->filename[bit_pos], +le16_to_cpu (de->name_len)); +if (res <0 ) +return ERR_PTR (res); +else if (res) + goto found; + }Overly long line here. Also 'else if' is unnecessary, just use 'if'.
Quoted 2 lines
Quoted 1 line
- Eric
The 0 case is important, since that reflects that the name was not found.
I meant doing the following:
if (res < 0) return ERR_PTR(res); if (res) goto found;
It doesn't really matter, but usually kernel code doesn't use 'else' after an early return.
- Eric
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
kernel test robot
build botRe: [PATCH v2 3/3] f2fs: Handle casefolding with Encryption
In reply to Daniel RosenbergThank you for the patch! Perhaps something to improve:
Hi Daniel,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on f2fs/dev-test]
[also build test WARNING on ext4/dev linus/master v5.10-rc4 next-20201117] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Daniel-Rosenberg/Add-support-for-Encryption-and-Casefolding-in-F2FS/20201117-120753 base: https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git dev-test
:::::: branch date: 9 hours ago
:::::: commit date: 9 hours ago
compiler: aarch64-linux-gcc (GCC) 9.3.0
If you fix the issue, kindly add following tag as appropriate
cppcheck possible warnings: (new ones prefixed by >>, may not real problems)
>> fs/f2fs/dir.c:206:3: warning: Assignment of function parameter has no effect outside the function. Did you forget dereferencing it? [uselessAssignmentPtrArg]
dentry_page = ERR_CAST(res);
^
fs/f2fs/f2fs.h:2200:15: warning: Local variable valid_node_count shadows outer function [shadowFunction]
unsigned int valid_node_count, user_block_count;
^
fs/f2fs/f2fs.h:2296:28: note: Shadowed declaration
static inline unsigned int valid_node_count(struct f2fs_sb_info *sbi)
^
fs/f2fs/f2fs.h:2200:15: note: Shadow variable
unsigned int valid_node_count, user_block_count;
^vim +206 fs/f2fs/dir.c
6b4ea0160ae236a Jaegeuk Kim 2012-11-14 191
2c2eb7a300cd7c6 Daniel Rosenberg 2019-07-23 192 static struct f2fs_dir_entry *find_in_block(struct inode *dir,
2c2eb7a300cd7c6 Daniel Rosenberg 2019-07-23 193 struct page *dentry_page,
43c780ba26244e4 Eric Biggers 2020-05-07 194 const struct f2fs_filename *fname,
17f930e0a649e15 Chao Yu 2020-09-26 195 int *max_slots)
4e6ebf6d4935914 Jaegeuk Kim 2014-10-13 196 {
4e6ebf6d4935914 Jaegeuk Kim 2014-10-13 197 struct f2fs_dentry_block *dentry_blk;
7b3cd7d6f026784 Jaegeuk Kim 2014-10-18 198 struct f2fs_dentry_ptr d;
6f0a1d1d8d24e7e Daniel Rosenberg 2020-11-17 199 struct f2fs_dir_entry *res;
4e6ebf6d4935914 Jaegeuk Kim 2014-10-13 200
bdbc90fa55af632 Yunlong Song 2018-02-28 201 dentry_blk = (struct f2fs_dentry_block *)page_address(dentry_page);
7b3cd7d6f026784 Jaegeuk Kim 2014-10-18 202
2c2eb7a300cd7c6 Daniel Rosenberg 2019-07-23 203 make_dentry_ptr_block(dir, &d, dentry_blk);
6f0a1d1d8d24e7e Daniel Rosenberg 2020-11-17 204 res = f2fs_find_target_dentry(&d, fname, max_slots);
6f0a1d1d8d24e7e Daniel Rosenberg 2020-11-17 205 if (IS_ERR(res)) {
6f0a1d1d8d24e7e Daniel Rosenberg 2020-11-17 @206 dentry_page = ERR_CAST(res);
6f0a1d1d8d24e7e Daniel Rosenberg 2020-11-17 207 res = NULL;
6f0a1d1d8d24e7e Daniel Rosenberg 2020-11-17 208 }
6f0a1d1d8d24e7e Daniel Rosenberg 2020-11-17 209 return res;
4e6ebf6d4935914 Jaegeuk Kim 2014-10-13 210 }4e6ebf6d4935914 Jaegeuk Kim 2014-10-13 211
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Eric Biggers
maintainerQuoted 2 lines · Daniel Rosenberg
I've included one ext4 patch from the previous set since it isn't in the f2fs branch, but is needed for the fscrypt changes.
Note that this is no longer the case, as this ext4 patch was merged in 5.10 (commit f8f4acb6cded: "ext4: use generic casefolding support").
- Eric