diff options
author | Eric Biggers <ebiggers@google.com> | 2016-12-05 11:12:44 -0800 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2016-12-31 16:26:20 -0500 |
commit | 54475f531bb8d7078f63c159e5e0615d486c498c (patch) | |
tree | ce3392249747414ad787dcffa1f2b919aff5f10c /fs/crypto | |
parent | 42d97eb0ade31e1bc537d086842f5d6e766d9d51 (diff) | |
download | blackbird-op-linux-54475f531bb8d7078f63c159e5e0615d486c498c.tar.gz blackbird-op-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/crypto')
-rw-r--r-- | fs/crypto/fname.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c index 56ad9d195f18..13052b85c393 100644 --- a/fs/crypto/fname.c +++ b/fs/crypto/fname.c @@ -332,7 +332,7 @@ int fscrypt_fname_usr_to_disk(struct inode *inode, * in a directory. Consequently, a user space name cannot be mapped to * a disk-space name */ - return -EACCES; + return -ENOKEY; } EXPORT_SYMBOL(fscrypt_fname_usr_to_disk); @@ -367,7 +367,7 @@ int fscrypt_setup_filename(struct inode *dir, const struct qstr *iname, return 0; } if (!lookup) - return -EACCES; + return -ENOKEY; /* * We don't have the key and we are doing a lookup; decode the |