diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2017-03-08 15:24:43 -0800 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-04-13 12:35:08 +0200 |
| commit | 2eb1cb2f30b709a2cbd36b8822af9541c750b888 (patch) | |
| tree | 9b2643d17dcd15794f0d2f9d08bd4ec63f090468 /fs/f2fs/namei.c | |
| parent | a04a2b3d02c1328694b0fe81977d1c46d2452db4 (diff) | |
fscrypt: catch up to v4.11-rc1
Keep validate_user_key() due to kasprintf() panic.
fscrypt:
- skcipher_ -> ablkcipher_
- fs/crypto/bio.c changes
f2fs:
- fscrypt: use ENOKEY when file cannot be created w/o key
- fscrypt: split supp and notsupp declarations into their own headers
- fscrypt: make fscrypt_operations.key_prefix a string
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs/namei.c')
| -rw-r--r-- | fs/f2fs/namei.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c index c51b221a3..af93070f5 100644 --- a/fs/f2fs/namei.c +++ b/fs/f2fs/namei.c @@ -412,7 +412,7 @@ static int f2fs_symlink(struct inode *dir, struct dentry *dentry, return err; if (!fscrypt_has_encryption_key(dir)) - return -EPERM; + return -ENOKEY; disk_link.len = (fscrypt_fname_encrypted_size(dir, len) + sizeof(struct fscrypt_symlink_data)); @@ -456,7 +456,7 @@ static int f2fs_symlink(struct inode *dir, struct dentry *dentry, goto err_out; if (!fscrypt_has_encryption_key(inode)) { - err = -EPERM; + err = -ENOKEY; goto err_out; } |