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

fscrypt: use EEXIST when file already uses different policy



As part of an effort to clean up fscrypt-related error codes, make
FS_IOC_SET_ENCRYPTION_POLICY fail with EEXIST when the file already uses
a different encryption policy.  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.

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 dffd0cfa

fs/crypto/policy.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -129,7 +129,7 @@ int fscrypt_ioctl_set_policy(struct file filp, const void __user arg)
		printk(KERN_WARNING
		"%s: Policy inconsistent with encryption context\n",
		__func__);
		ret = -EINVAL;
		ret = -EEXIST;
		}

		inode_unlock(inode);

Admin message