fscrypt: use ENOTDIR when setting encryption policy on nondirectory

As part of an effort to clean up fscrypt-related error codes, make
FS_IOC_SET_ENCRYPTION_POLICY fail with ENOTDIR when the file descriptor
does not refer to a directory.  This is more descriptive than EINVAL,
which was ambiguous with some of the other error cases.

I am not aware of any users who might be relying on the previous error
code of EINVAL, which was never documented anywhere, and in some buggy
kernels did not exist at all as the S_ISDIR() check was missing.

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>

diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c
index d6cd7ea4851da877b13c7af306fd07f8468a54f4..40ecd7173e3479531752663db7473521d5013536 100644 (file)
--- a/fs/crypto/policy.c
+++ b/fs/crypto/policy.c
@@ -116,7 +116,7 @@ int fscrypt_ioctl_set_policy(struct file *filp, const void __user *arg)
 
        if (!inode_has_encryption_context(inode)) {
                if (!S_ISDIR(inode->i_mode))
-                       ret = -EINVAL;
+                       ret = -ENOTDIR;
                else if (!inode->i_sb->s_cop->empty_dir)
                        ret = -EOPNOTSUPP;
                else if (!inode->i_sb->s_cop->empty_dir(inode))