diff options
| author | Eric Biggers | 2016-12-05 20:12:44 +0100 |
|---|---|---|
| committer | Theodore Ts'o | 2016-12-31 22:26:20 +0100 |
| commit | 54475f531bb8d7078f63c159e5e0615d486c498c (patch) | |
| tree | ce3392249747414ad787dcffa1f2b919aff5f10c /fs/f2fs/dir.c | |
| parent | fscrypt: fix renaming and linking special files (diff) | |
| download | kernel-qcow2-linux-54475f531bb8d7078f63c159e5e0615d486c498c.tar.gz kernel-qcow2-linux-54475f531bb8d7078f63c159e5e0615d486c498c.tar.xz kernel-qcow2-linux-54475f531bb8d7078f63c159e5e0615d486c498c.zip | |
fscrypt: use ENOKEY when file cannot be created w/o key
As part of an effort to clean up fscrypt-related error codes, make
attempting to create a file in an encrypted directory that hasn't been
"unlocked" fail with ENOKEY. Previously, several error codes were used
for this case, including ENOENT, EACCES, and EPERM, and they were not
consistent between and within filesystems. ENOKEY is a better choice
because it expresses that the failure is due to lacking the encryption
key. It also matches the error code returned when trying to open an
encrypted regular file without the key.
I am not aware of any users who might be relying on the previous
inconsistent error codes, which were never documented anywhere.
This failure case will be exercised by an xfstest.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/f2fs/dir.c')
| -rw-r--r-- | fs/f2fs/dir.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index 827c5daef4fc..18607fc5240d 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -268,7 +268,10 @@ struct f2fs_dir_entry *f2fs_find_entry(struct inode *dir, err = fscrypt_setup_filename(dir, child, 1, &fname); if (err) { - *res_page = ERR_PTR(err); + if (err == -ENOENT) + *res_page = NULL; + else + *res_page = ERR_PTR(err); return NULL; } |