From: <gregkh@linuxfoundation.org>
To: ebiggers@google.com, ebiggers@kernel.org,
gregkh@linuxfoundation.org,
linux-f2fs-devel@lists.sourceforge.net,
linux-mtd@lists.infradead.org
Cc: stable-commits@vger.kernel.org
Subject: [f2fs-dev] Patch "f2fs: prevent creating duplicate encrypted filenames" has been added to the 5.4-stable tree
Date: Wed, 30 Dec 2020 16:39:11 +0100 [thread overview]
Message-ID: <160934275115840@kroah.com> (raw)
In-Reply-To: <20201228185433.61129-4-ebiggers@kernel.org>
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 <stable@vger.kernel.org> know about it.
From foo@baz Wed Dec 30 04:37:58 PM CET 2020
From: Eric Biggers <ebiggers@kernel.org>
Date: Mon, 28 Dec 2020 10:54:32 -0800
Subject: f2fs: prevent creating duplicate encrypted filenames
To: stable@vger.kernel.org
Cc: linux-fscrypt@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-mtd@lists.infradead.org
Message-ID: <20201228185433.61129-4-ebiggers@kernel.org>
From: Eric Biggers <ebiggers@google.com>
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.
Fixes: 9ea97163c6da ("f2fs crypto: add filename encryption for f2fs_add_link")
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20201118075609.120337-4-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/f2fs/f2fs.h | 2 ++
1 file changed, 2 insertions(+)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -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 ebiggers@kernel.org 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
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
WARNING: multiple messages have this Message-ID (diff)
From: <gregkh@linuxfoundation.org>
To: ebiggers@google.com, ebiggers@kernel.org,
gregkh@linuxfoundation.org,
linux-f2fs-devel@lists.sourceforge.net,
linux-mtd@lists.infradead.org
Cc: stable-commits@vger.kernel.org
Subject: Patch "f2fs: prevent creating duplicate encrypted filenames" has been added to the 5.4-stable tree
Date: Wed, 30 Dec 2020 16:39:11 +0100 [thread overview]
Message-ID: <160934275115840@kroah.com> (raw)
In-Reply-To: <20201228185433.61129-4-ebiggers@kernel.org>
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 <stable@vger.kernel.org> know about it.
From foo@baz Wed Dec 30 04:37:58 PM CET 2020
From: Eric Biggers <ebiggers@kernel.org>
Date: Mon, 28 Dec 2020 10:54:32 -0800
Subject: f2fs: prevent creating duplicate encrypted filenames
To: stable@vger.kernel.org
Cc: linux-fscrypt@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-mtd@lists.infradead.org
Message-ID: <20201228185433.61129-4-ebiggers@kernel.org>
From: Eric Biggers <ebiggers@google.com>
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.
Fixes: 9ea97163c6da ("f2fs crypto: add filename encryption for f2fs_add_link")
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20201118075609.120337-4-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/f2fs/f2fs.h | 2 ++
1 file changed, 2 insertions(+)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -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 ebiggers@kernel.org 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 MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2020-12-30 15:38 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-28 18:54 [PATCH 5.4 0/4] fscrypt: prevent creating duplicate encrypted filenames Eric Biggers
2020-12-28 18:54 ` Eric Biggers
2020-12-28 18:54 ` [f2fs-dev] " Eric Biggers
2020-12-28 18:54 ` [PATCH 5.4 1/4] fscrypt: add fscrypt_is_nokey_name() Eric Biggers
2020-12-28 18:54 ` Eric Biggers
2020-12-28 18:54 ` [f2fs-dev] " Eric Biggers
2020-12-30 15:39 ` [f2fs-dev] Patch "fscrypt: add fscrypt_is_nokey_name()" has been added to the 5.4-stable tree gregkh
2020-12-30 15:39 ` gregkh
2020-12-28 18:54 ` [PATCH 5.4 2/4] ext4: prevent creating duplicate encrypted filenames Eric Biggers
2020-12-28 18:54 ` Eric Biggers
2020-12-28 18:54 ` [f2fs-dev] " Eric Biggers
2020-12-30 15:39 ` [f2fs-dev] Patch "ext4: prevent creating duplicate encrypted filenames" has been added to the 5.4-stable tree gregkh
2020-12-30 15:39 ` gregkh
2020-12-28 18:54 ` [PATCH 5.4 3/4] f2fs: prevent creating duplicate encrypted filenames Eric Biggers
2020-12-28 18:54 ` Eric Biggers
2020-12-28 18:54 ` [f2fs-dev] " Eric Biggers
2020-12-30 15:39 ` gregkh [this message]
2020-12-30 15:39 ` Patch "f2fs: prevent creating duplicate encrypted filenames" has been added to the 5.4-stable tree gregkh
2020-12-28 18:54 ` [PATCH 5.4 4/4] ubifs: prevent creating duplicate encrypted filenames Eric Biggers
2020-12-28 18:54 ` Eric Biggers
2020-12-28 18:54 ` [f2fs-dev] " Eric Biggers
2020-12-30 15:39 ` [f2fs-dev] Patch "ubifs: prevent creating duplicate encrypted filenames" has been added to the 5.4-stable tree gregkh
2020-12-30 15:39 ` gregkh
2020-12-30 15:39 ` [PATCH 5.4 0/4] fscrypt: prevent creating duplicate encrypted filenames Greg KH
2020-12-30 15:39 ` Greg KH
2020-12-30 15:39 ` [f2fs-dev] " Greg KH
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=160934275115840@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=ebiggers@google.com \
--cc=ebiggers@kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-mtd@lists.infradead.org \
--cc=stable-commits@vger.kernel.org \
/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: link
Be 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.