| Message ID | 1480965168-38747-3-git-send-email-ebiggers@google.com |
|---|---|
| State | Not Applicable |
| Headers | show |
On Mon, Dec 05, 2016 at 11:12:45AM -0800, Eric Biggers wrote: > 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> Applied to the fscrypt branch, thanks. - Ted -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c index b96a10e..1118f3a 100644 --- 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))
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> --- fs/crypto/policy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)