This is a note to let you know that I've just added the patch titled
fscrypt: use EEXIST when file already uses different policy
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
fscrypt-use-eexist-when-file-already-uses-different-policy.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 8488cd96ff88966ccb076e4f3654f59d84ba686d Mon Sep 17 00:00:00 2001
From: Eric Biggers <ebiggers@xxxxxxxxxx>
Date: Mon, 5 Dec 2016 11:12:46 -0800
Subject: fscrypt: use EEXIST when file already uses different policy
From: Eric Biggers <ebiggers@xxxxxxxxxx>
commit 8488cd96ff88966ccb076e4f3654f59d84ba686d upstream.
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@xxxxxxxxxx>
Signed-off-by: Theodore Ts'o <tytso@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/crypto/policy.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/fs/crypto/policy.c
+++ b/fs/crypto/policy.c
@@ -131,7 +131,7 @@ int fscrypt_ioctl_set_policy(struct file
printk(KERN_WARNING
"%s: Policy inconsistent with encryption context\n",
__func__);
- ret = -EINVAL;
+ ret = -EEXIST;
}
inode_unlock(inode);
Patches currently in stable-queue which might be from ebiggers@xxxxxxxxxx are
queue-4.9/fscrypt-return-exdev-for-incompatible-rename-or-link-into-encrypted-dir.patch
queue-4.9/fscrypto-move-ioctl-processing-more-fully-into-common-code.patch
queue-4.9/fscrypt-use-eexist-when-file-already-uses-different-policy.patch
