fscrypt: prevent creating duplicate encrypted filenames
Subsystems (6)
Eric Biggers
maintainercover fscrypt: prevent creating duplicate encrypted filenames
Backport four commits from v5.11-rc1. I resolved a conflict in the first one. The rest are clean cherry-picks which didn't get picked up yet because they depend on the first one.
Eric Biggers (4):
fscrypt: add fscrypt_is_nokey_name()
ext4: prevent creating duplicate encrypted filenames
f2fs: prevent creating duplicate encrypted filenames
ubifs: prevent creating duplicate encrypted filenames
fs/crypto/hooks.c | 10 +++++----- fs/ext4/namei.c | 3 +++ fs/f2fs/f2fs.h | 2 ++ fs/ubifs/dir.c | 17 +++++++++++++---- include/linux/fscrypt.h | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 57 insertions(+), 9 deletions(-)
Signature · 8 lines
2.29.2 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Eric Biggers
maintainerPATCH 1/4 fscrypt: add fscrypt_is_nokey_name()
From: Eric Biggers <[email protected]>
commit 159e1de201b6fca10bfec50405a3b53a561096a8 upstream.
It's possible to create a duplicate filename in an encrypted directory by creating a file concurrently with adding the encryption key.
Specifically, sys_open(O_CREAT) (or sys_mkdir(), sys_mknod(), or sys_symlink()) can lookup the target filename while the directory's encryption key hasn't been added yet, resulting in a negative no-key dentry. The VFS then calls ->create() (or ->mkdir(), ->mknod(), or ->symlink()) because the dentry is negative. Normally, ->create() would return -ENOKEY due to the directory's key being unavailable. However, if the key was added between the dentry lookup and ->create(), then the filesystem will go ahead and try to create the file.
If the target filename happens to already exist as a normal name (not a no-key name), a duplicate filename may be added to the directory.
In order to fix this, we need to fix the filesystems to prevent ->create(), ->mkdir(), ->mknod(), and ->symlink() on no-key names. (->rename() and ->link() need it too, but those are already handled correctly by fscrypt_prepare_rename() and fscrypt_prepare_link().)
In preparation for this, add a helper function fscrypt_is_nokey_name() that filesystems can use to do this check. Use this helper function for the existing checks that fs/crypto/ does for rename and link.
--- fs/crypto/hooks.c | 10 +++++----- include/linux/fscrypt.h | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 5 deletions(-)
fs/crypto/hooks.c +5 -5
@@ -58,8 +58,8 @@ int __fscrypt_prepare_link(struct inode *inode, struct inode *dir,if (err)return err; -/* ... in case we looked up ciphertext name before key was added */ -if (dentry->d_flags &DCACHE_ENCRYPTED_NAME ) +/* ... in case we looked up no-key name before key was added */ +if (fscrypt_is_nokey_name (dentry))return -ENOKEY ;if (!fscrypt_has_permitted_context (dir, inode))
@@ -83,9 +83,9 @@ int __fscrypt_prepare_rename(struct inode *old_dir, struct dentry *old_dentry,if (err)return err; -/* ... in case we looked up ciphertext name(s) before key was added */ -if ((old_dentry->d_flags | new_dentry->d_flags) & -DCACHE_ENCRYPTED_NAME ) +/* ... in case we looked up no-key name(s) before key was added */ +if (fscrypt_is_nokey_name (old_dentry) || +fscrypt_is_nokey_name (new_dentry))return -ENOKEY ;if (old_dir != new_dir) {
include/linux/fscrypt.h +34 -0
@@ -100,6 +100,35 @@ static inline void fscrypt_handle_d_move(struct dentry *dentry) dentry->d_flags &= ~DCACHE_ENCRYPTED_NAME ; } +/** +* fscrypt_is_nokey_name() - test whether a dentry is a no-key name +* @dentry: the dentry to check +* +* This returns true if the dentry is a no-key dentry. A no-key dentry is a +* dentry that was created in an encrypted directory that hasn't had its +* encryption key added yet. Such dentries may be either positive or negative. +* +* When a filesystem is asked to create a new filename in an encrypted directory +* and the new filename's dentry is a no-key dentry, it must fail the operation +* with ENOKEY. This includes ->create(), ->mkdir(), ->mknod(), ->symlink(), +* ->rename(), and ->link(). (However, ->rename() and ->link() are already +* handled by fscrypt_prepare_rename() and fscrypt_prepare_link().) +* +* This is necessary because creating a filename requires the directory's +* encryption key, but just checking for the key on the directory inode during +* the final filesystem operation doesn't guarantee that the key was available +* during the preceding dentry lookup. And the key must have already been +* available during the dentry lookup in order for it to have been checked +* whether the filename already exists in the directory and for the new file's +* dentry not to be invalidated due to it incorrectly having the no-key flag. +* +* Return: %true if the dentry is a no-key name +*/ +static inline bool fscrypt_is_nokey_name (const struct dentry *dentry) +{ +return dentry->d_flags &DCACHE_ENCRYPTED_NAME ; +} +/* crypto.c */ extern void fscrypt_enqueue_decrypt_work (struct work_struct *);extern struct fscrypt_ctx *fscrypt_get_ctx (gfp_t );
@@ -290,6 +319,11 @@ static inline void fscrypt_handle_d_move(struct dentry *dentry) { } +static inline bool fscrypt_is_nokey_name (const struct dentry *dentry) +{ +return false; +} +/* crypto.c */ static inline void fscrypt_enqueue_decrypt_work (struct work_struct *work) {
Signature · 8 lines
2.29.2 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
[f2fs-dev] Patch "fscrypt: add fscrypt_is_nokey_name()" has been added to the 5.4-stable tree
This is a note to let you know that I've just added the patch titled
fscrypt: add fscrypt_is_nokey_name()
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
fscrypt-add-fscrypt_is_nokey_name.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From foo@baz Wed Dec 30 04:37:58 PM CET 2020
From: Eric Biggers <[email protected]>
Date: Mon, 28 Dec 2020 10:54:30 -0800
Subject: fscrypt: add fscrypt_is_nokey_name()
To: [email protected]
Cc: [email protected], [email protected], [email protected], [email protected]
Message-ID: <[email protected]>
From: Eric Biggers <[email protected]>
commit 159e1de201b6fca10bfec50405a3b53a561096a8 upstream.
It's possible to create a duplicate filename in an encrypted directory by creating a file concurrently with adding the encryption key.
Specifically, sys_open(O_CREAT) (or sys_mkdir(), sys_mknod(), or sys_symlink()) can lookup the target filename while the directory's encryption key hasn't been added yet, resulting in a negative no-key dentry. The VFS then calls ->create() (or ->mkdir(), ->mknod(), or ->symlink()) because the dentry is negative. Normally, ->create() would return -ENOKEY due to the directory's key being unavailable. However, if the key was added between the dentry lookup and ->create(), then the filesystem will go ahead and try to create the file.
If the target filename happens to already exist as a normal name (not a no-key name), a duplicate filename may be added to the directory.
In order to fix this, we need to fix the filesystems to prevent ->create(), ->mkdir(), ->mknod(), and ->symlink() on no-key names. (->rename() and ->link() need it too, but those are already handled correctly by fscrypt_prepare_rename() and fscrypt_prepare_link().)
In preparation for this, add a helper function fscrypt_is_nokey_name() that filesystems can use to do this check. Use this helper function for the existing checks that fs/crypto/ does for rename and link.
--- fs/crypto/hooks.c | 10 +++++----- include/linux/fscrypt.h | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 5 deletions(-)
fs/crypto/hooks.c +5 -5
@@ -58,8 +58,8 @@ int __fscrypt_prepare_link(struct inodeif (err)return err; -/* ... in case we looked up ciphertext name before key was added */ -if (dentry->d_flags &DCACHE_ENCRYPTED_NAME ) +/* ... in case we looked up no-key name before key was added */ +if (fscrypt_is_nokey_name (dentry))return -ENOKEY ;if (!fscrypt_has_permitted_context (dir, inode))
@@ -83,9 +83,9 @@ int __fscrypt_prepare_rename(struct inodif (err)return err; -/* ... in case we looked up ciphertext name(s) before key was added */ -if ((old_dentry->d_flags | new_dentry->d_flags) & -DCACHE_ENCRYPTED_NAME ) +/* ... in case we looked up no-key name(s) before key was added */ +if (fscrypt_is_nokey_name (old_dentry) || +fscrypt_is_nokey_name (new_dentry))return -ENOKEY ;if (old_dir != new_dir) {
include/linux/fscrypt.h +34 -0
@@ -100,6 +100,35 @@ static inline void fscrypt_handle_d_move dentry->d_flags &= ~DCACHE_ENCRYPTED_NAME ; } +/** +* fscrypt_is_nokey_name() - test whether a dentry is a no-key name +* @dentry: the dentry to check +* +* This returns true if the dentry is a no-key dentry. A no-key dentry is a +* dentry that was created in an encrypted directory that hasn't had its +* encryption key added yet. Such dentries may be either positive or negative. +* +* When a filesystem is asked to create a new filename in an encrypted directory +* and the new filename's dentry is a no-key dentry, it must fail the operation +* with ENOKEY. This includes ->create(), ->mkdir(), ->mknod(), ->symlink(), +* ->rename(), and ->link(). (However, ->rename() and ->link() are already +* handled by fscrypt_prepare_rename() and fscrypt_prepare_link().) +* +* This is necessary because creating a filename requires the directory's +* encryption key, but just checking for the key on the directory inode during +* the final filesystem operation doesn't guarantee that the key was available +* during the preceding dentry lookup. And the key must have already been +* available during the dentry lookup in order for it to have been checked +* whether the filename already exists in the directory and for the new file's +* dentry not to be invalidated due to it incorrectly having the no-key flag. +* +* Return: %true if the dentry is a no-key name +*/ +static inline bool fscrypt_is_nokey_name (const struct dentry *dentry) +{ +return dentry->d_flags &DCACHE_ENCRYPTED_NAME ; +} +/* crypto.c */ extern void fscrypt_enqueue_decrypt_work (struct work_struct *);extern struct fscrypt_ctx *fscrypt_get_ctx (gfp_t );
@@ -290,6 +319,11 @@ static inline void fscrypt_handle_d_move { } +static inline bool fscrypt_is_nokey_name (const struct dentry *dentry) +{ +return false; +} +/* crypto.c */ static inline void fscrypt_enqueue_decrypt_work (struct work_struct *work) {
Patches currently in stable-queue which might be from [email protected] are
queue-5.4/fscrypt-remove-kernel-internal-constants-from-uapi-header.patch queue-5.4/fscrypt-add-fscrypt_is_nokey_name.patch queue-5.4/ext4-prevent-creating-duplicate-encrypted-filenames.patch queue-5.4/ubifs-prevent-creating-duplicate-encrypted-filenames.patch queue-5.4/f2fs-prevent-creating-duplicate-encrypted-filenames.patch
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Eric Biggers
maintainerPATCH 2/4 ext4: prevent creating duplicate encrypted filenames
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
commit 75d18cd1868c2aee43553723872c35d7908f240f upstream.
As described in "fscrypt: add fscrypt_is_nokey_name()", it's possible to create a duplicate filename in an encrypted directory by creating a file concurrently with adding the directory's encryption key.
Fix this bug on ext4 by rejecting no-key dentries in ext4_add_entry().
Note that the duplicate check in ext4_find_dest_de() sometimes prevented this bug. However in many cases it didn't, since ext4_find_dest_de() doesn't examine every dentry.
--- fs/ext4/namei.c | 3 +++ 1 file changed, 3 insertions(+)
fs/ext4/namei.c +3 -0
@@ -2192,6 +2192,9 @@ static int ext4_add_entry(handle_t *handle, struct dentry *dentry,if (!dentry->d_name.len)return -EINVAL ; +if (fscrypt_is_nokey_name (dentry)) +return -ENOKEY ; +#ifdef CONFIG_UNICODE if (ext4_has_strict_mode (sbi) &&IS_CASEFOLDED (dir) && sbi->s_encoding &&utf8_validate (sbi->s_encoding, &dentry->d_name))
Signature · 8 lines
2.29.2 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
[f2fs-dev] Patch "ext4: prevent creating duplicate encrypted filenames" has been added to the 5.4-stable tree
This is a note to let you know that I've just added the patch titled
ext4: prevent creating duplicate encrypted filenames
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ext4-prevent-creating-duplicate-encrypted-filenames.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From foo@baz Wed Dec 30 04:37:58 PM CET 2020
From: Eric Biggers <[email protected]>
Date: Mon, 28 Dec 2020 10:54:31 -0800
Subject: ext4: prevent creating duplicate encrypted filenames
To: [email protected]
Cc: [email protected], [email protected], [email protected], [email protected]
Message-ID: <[email protected]>
From: Eric Biggers <[email protected]>
commit 75d18cd1868c2aee43553723872c35d7908f240f upstream.
As described in "fscrypt: add fscrypt_is_nokey_name()", it's possible to create a duplicate filename in an encrypted directory by creating a file concurrently with adding the directory's encryption key.
Fix this bug on ext4 by rejecting no-key dentries in ext4_add_entry().
Note that the duplicate check in ext4_find_dest_de() sometimes prevented this bug. However in many cases it didn't, since ext4_find_dest_de() doesn't examine every dentry.
--- fs/ext4/namei.c | 3 +++ 1 file changed, 3 insertions(+)
fs/ext4/namei.c +3 -0
@@ -2192,6 +2192,9 @@ static int ext4_add_entry(handle_t *handif (!dentry->d_name.len)return -EINVAL ; +if (fscrypt_is_nokey_name (dentry)) +return -ENOKEY ; +#ifdef CONFIG_UNICODE if (ext4_has_strict_mode (sbi) &&IS_CASEFOLDED (dir) && sbi->s_encoding &&utf8_validate (sbi->s_encoding, &dentry->d_name))
Patches currently in stable-queue which might be from [email protected] are
queue-5.4/fscrypt-remove-kernel-internal-constants-from-uapi-header.patch queue-5.4/fscrypt-add-fscrypt_is_nokey_name.patch queue-5.4/ext4-prevent-creating-duplicate-encrypted-filenames.patch queue-5.4/ubifs-prevent-creating-duplicate-encrypted-filenames.patch queue-5.4/f2fs-prevent-creating-duplicate-encrypted-filenames.patch
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Eric Biggers
maintainerPATCH 3/4 f2fs: prevent creating duplicate encrypted filenames
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
commit bfc2b7e8518999003a61f91c1deb5e88ed77b07d upstream.
As described in "fscrypt: add fscrypt_is_nokey_name()", it's possible to create a duplicate filename in an encrypted directory by creating a file concurrently with adding the directory's encryption key.
Fix this bug on f2fs by rejecting no-key dentries in f2fs_add_link().
Note that the weird check for the current task in f2fs_do_add_link() seems to make this bug difficult to reproduce on f2fs.
--- fs/f2fs/f2fs.h | 2 ++ 1 file changed, 2 insertions(+)
fs/f2fs/f2fs.h +2 -0
@@ -2998,6 +2998,8 @@ bool f2fs_empty_dir(struct inode *dir);static inline int f2fs_add_link (struct dentry *dentry,struct inode *inode) { +if (fscrypt_is_nokey_name (dentry)) +return -ENOKEY ;return f2fs_do_add_link (d_inode (dentry->d_parent), &dentry->d_name, inode, inode->i_ino, inode->i_mode); }
Signature · 8 lines
2.29.2 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
[f2fs-dev] Patch "f2fs: prevent creating duplicate encrypted filenames" has been added to the 5.4-stable tree
This is a note to let you know that I've just added the patch titled
f2fs: prevent creating duplicate encrypted filenames
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
f2fs-prevent-creating-duplicate-encrypted-filenames.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From foo@baz Wed Dec 30 04:37:58 PM CET 2020
From: Eric Biggers <[email protected]>
Date: Mon, 28 Dec 2020 10:54:32 -0800
Subject: f2fs: prevent creating duplicate encrypted filenames
To: [email protected]
Cc: [email protected], [email protected], [email protected], [email protected]
Message-ID: <[email protected]>
From: Eric Biggers <[email protected]>
commit bfc2b7e8518999003a61f91c1deb5e88ed77b07d upstream.
As described in "fscrypt: add fscrypt_is_nokey_name()", it's possible to create a duplicate filename in an encrypted directory by creating a file concurrently with adding the directory's encryption key.
Fix this bug on f2fs by rejecting no-key dentries in f2fs_add_link().
Note that the weird check for the current task in f2fs_do_add_link() seems to make this bug difficult to reproduce on f2fs.
--- fs/f2fs/f2fs.h | 2 ++ 1 file changed, 2 insertions(+)
fs/f2fs/f2fs.h +2 -0
@@ -2998,6 +2998,8 @@ bool f2fs_empty_dir(struct inode *dir);static inline int f2fs_add_link (struct dentry *dentry,struct inode *inode) { +if (fscrypt_is_nokey_name (dentry)) +return -ENOKEY ;return f2fs_do_add_link (d_inode (dentry->d_parent), &dentry->d_name, inode, inode->i_ino, inode->i_mode); }
Patches currently in stable-queue which might be from [email protected] are
queue-5.4/fscrypt-remove-kernel-internal-constants-from-uapi-header.patch queue-5.4/fscrypt-add-fscrypt_is_nokey_name.patch queue-5.4/ext4-prevent-creating-duplicate-encrypted-filenames.patch queue-5.4/ubifs-prevent-creating-duplicate-encrypted-filenames.patch queue-5.4/f2fs-prevent-creating-duplicate-encrypted-filenames.patch
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Eric Biggers
maintainerPATCH 4/4 ubifs: prevent creating duplicate encrypted filenames
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
commit 76786a0f083473de31678bdb259a3d4167cf756d upstream.
As described in "fscrypt: add fscrypt_is_nokey_name()", it's possible to create a duplicate filename in an encrypted directory by creating a file concurrently with adding the directory's encryption key.
Fix this bug on ubifs by rejecting no-key dentries in ubifs_create(), ubifs_mkdir(), ubifs_mknod(), and ubifs_symlink().
Note that ubifs doesn't actually report the duplicate filenames from readdir, but rather it seems to replace the original dentry with a new one (which is still wrong, just a different effect from ext4).
On ubifs, this fixes xfstest generic/595 as well as the new xfstest I wrote specifically for this bug.
--- fs/ubifs/dir.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
fs/ubifs/dir.c +13 -4
@@ -278,6 +278,15 @@ static struct dentry *ubifs_lookup(struct inode *dir, struct dentry *dentry,return d_splice_alias (inode, dentry); } +static int ubifs_prepare_create (struct inode *dir,struct dentry *dentry, +struct fscrypt_name *nm) +{ +if (fscrypt_is_nokey_name (dentry)) +return -ENOKEY ; + +return fscrypt_setup_filename (dir, &dentry->d_name,0 , nm); +} +static int ubifs_create (struct inode *dir,struct dentry *dentry,umode_t mode,bool excl) {
@@ -301,7 +310,7 @@ static int ubifs_create(struct inode *dir, struct dentry *dentry, umode_t mode,if (err)return err; - err =fscrypt_setup_filename (dir, &dentry->d_name,0 , &nm); + err =ubifs_prepare_create (dir, dentry, &nm);if (err) goto out_budg;
@@ -961,7 +970,7 @@ static int ubifs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)if (err)return err; - err =fscrypt_setup_filename (dir, &dentry->d_name,0 , &nm); + err =ubifs_prepare_create (dir, dentry, &nm);if (err) goto out_budg;
@@ -1046,7 +1055,7 @@ static int ubifs_mknod(struct inode *dir, struct dentry *dentry,return err; } - err =fscrypt_setup_filename (dir, &dentry->d_name,0 , &nm); + err =ubifs_prepare_create (dir, dentry, &nm);if (err) {kfree (dev); goto out_budg;
@@ -1130,7 +1139,7 @@ static int ubifs_symlink(struct inode *dir, struct dentry *dentry,if (err)return err; - err =fscrypt_setup_filename (dir, &dentry->d_name,0 , &nm); + err =ubifs_prepare_create (dir, dentry, &nm);if (err) goto out_budg;
Signature · 8 lines
2.29.2 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
[f2fs-dev] Patch "ubifs: prevent creating duplicate encrypted filenames" has been added to the 5.4-stable tree
This is a note to let you know that I've just added the patch titled
ubifs: prevent creating duplicate encrypted filenames
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ubifs-prevent-creating-duplicate-encrypted-filenames.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From foo@baz Wed Dec 30 04:37:58 PM CET 2020
From: Eric Biggers <[email protected]>
Date: Mon, 28 Dec 2020 10:54:33 -0800
Subject: ubifs: prevent creating duplicate encrypted filenames
To: [email protected]
Cc: [email protected], [email protected], [email protected], [email protected]
Message-ID: <[email protected]>
From: Eric Biggers <[email protected]>
commit 76786a0f083473de31678bdb259a3d4167cf756d upstream.
As described in "fscrypt: add fscrypt_is_nokey_name()", it's possible to create a duplicate filename in an encrypted directory by creating a file concurrently with adding the directory's encryption key.
Fix this bug on ubifs by rejecting no-key dentries in ubifs_create(), ubifs_mkdir(), ubifs_mknod(), and ubifs_symlink().
Note that ubifs doesn't actually report the duplicate filenames from readdir, but rather it seems to replace the original dentry with a new one (which is still wrong, just a different effect from ext4).
On ubifs, this fixes xfstest generic/595 as well as the new xfstest I wrote specifically for this bug.
--- fs/ubifs/dir.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
fs/ubifs/dir.c +13 -4
@@ -278,6 +278,15 @@ done:return d_splice_alias (inode, dentry); } +static int ubifs_prepare_create (struct inode *dir,struct dentry *dentry, +struct fscrypt_name *nm) +{ +if (fscrypt_is_nokey_name (dentry)) +return -ENOKEY ; + +return fscrypt_setup_filename (dir, &dentry->d_name,0 , nm); +} +static int ubifs_create (struct inode *dir,struct dentry *dentry,umode_t mode,bool excl) {
@@ -301,7 +310,7 @@ static int ubifs_create(struct inode *diif (err)return err; - err =fscrypt_setup_filename (dir, &dentry->d_name,0 , &nm); + err =ubifs_prepare_create (dir, dentry, &nm);if (err) goto out_budg;
@@ -961,7 +970,7 @@ static int ubifs_mkdir(struct inode *dirif (err)return err; - err =fscrypt_setup_filename (dir, &dentry->d_name,0 , &nm); + err =ubifs_prepare_create (dir, dentry, &nm);if (err) goto out_budg;
@@ -1046,7 +1055,7 @@ static int ubifs_mknod(struct inode *dirreturn err; } - err =fscrypt_setup_filename (dir, &dentry->d_name,0 , &nm); + err =ubifs_prepare_create (dir, dentry, &nm);if (err) {kfree (dev); goto out_budg;
@@ -1130,7 +1139,7 @@ static int ubifs_symlink(struct inode *dif (err)return err; - err =fscrypt_setup_filename (dir, &dentry->d_name,0 , &nm); + err =ubifs_prepare_create (dir, dentry, &nm);if (err) goto out_budg;
Patches currently in stable-queue which might be from [email protected] are
queue-5.4/fscrypt-remove-kernel-internal-constants-from-uapi-header.patch queue-5.4/fscrypt-add-fscrypt_is_nokey_name.patch queue-5.4/ext4-prevent-creating-duplicate-encrypted-filenames.patch queue-5.4/ubifs-prevent-creating-duplicate-encrypted-filenames.patch queue-5.4/f2fs-prevent-creating-duplicate-encrypted-filenames.patch
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Quoted 10 lines · Eric Biggers
Backport four commits from v5.11-rc1. I resolved a conflict in the first one. The rest are clean cherry-picks which didn't get picked up yet because they depend on the first one.
Eric Biggers (4):
fscrypt: addfscrypt_is_nokey_name()
ext4: prevent creating duplicate encrypted filenames
f2fs: prevent creating duplicate encrypted filenames
ubifs: prevent creating duplicate encrypted filenames
All now applied, thanks.
greg k-h
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/