diff options
author | Tyler Hicks <tyhicks@canonical.com> | 2018-03-28 23:41:52 +0000 |
---|---|---|
committer | Tyler Hicks <tyhicks@canonical.com> | 2018-04-16 18:51:22 +0000 |
commit | e86281e700cca8a773f9a572fa406adf2784ba5c (patch) | |
tree | 541db393f7c69a9de74e647d5292774d8218989f /fs/afs | |
parent | f62fd7a77717350e850f3c4a5373fe8e64871025 (diff) | |
download | linux-stable-e86281e700cca8a773f9a572fa406adf2784ba5c.tar.gz linux-stable-e86281e700cca8a773f9a572fa406adf2784ba5c.tar.bz2 linux-stable-e86281e700cca8a773f9a572fa406adf2784ba5c.zip |
eCryptfs: don't pass up plaintext names when using filename encryption
Both ecryptfs_filldir() and ecryptfs_readlink_lower() use
ecryptfs_decode_and_decrypt_filename() to translate lower filenames to
upper filenames. The function correctly passes up lower filenames,
unchanged, when filename encryption isn't in use. However, it was also
passing up lower filenames when the filename wasn't encrypted or
when decryption failed. Since 88ae4ab9802e, eCryptfs refuses to lookup
lower plaintext names when filename encryption is enabled so this
resulted in a situation where userspace would see lower plaintext
filenames in calls to getdents(2) but then not be able to lookup those
filenames.
An example of this can be seen when enabling filename encryption on an
eCryptfs mount at the root directory of an Ext4 filesystem:
$ ls -1i /lower
12 ECRYPTFS_FNEK_ENCRYPTED.FWYZD8TcW.5FV-TKTEYOHsheiHX9a-w.NURCCYIMjI8pn5BDB9-h3fXwrE--
11 lost+found
$ ls -1i /upper
ls: cannot access '/upper/lost+found': No such file or directory
? lost+found
12 test
With this change, the lower lost+found dentry is ignored:
$ ls -1i /lower
12 ECRYPTFS_FNEK_ENCRYPTED.FWYZD8TcW.5FV-TKTEYOHsheiHX9a-w.NURCCYIMjI8pn5BDB9-h3fXwrE--
11 lost+found
$ ls -1i /upper
12 test
Additionally, some potentially noisy error/info messages in the related
code paths are turned into debug messages so that the logs can't be
easily filled.
Fixes: 88ae4ab9802e ("ecryptfs_lookup(): try either only encrypted or plaintext name")
Reported-by: Guenter Roeck <linux@roeck-us.net>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Diffstat (limited to 'fs/afs')
0 files changed, 0 insertions, 0 deletions