Commit dffd0cfa authored Dec 05, 2016 by Eric Biggers Committed by Theodore Ts'o Dec 31, 2016

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>

parent 54475f53

fs/crypto/policy.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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))

Admin message