linux-f2fs-devel.lists.sourceforge.net archive mirror
 help / color / mirror / Atom feed
From: Eric Biggers <ebiggers@google.com>
To: linux-fsdevel@vger.kernel.org
Cc: linux-ext4@vger.kernel.org,
	linux-f2fs-devel@lists.sourceforge.net,
	"Theodore Y . Ts'o" <tytso@mit.edu>,
	Jaegeuk Kim <jaegeuk@kernel.org>,
	Richard Weinberger <richard@nod.at>,
	David Gstir <david@sigma-star.at>,
	Eric Biggers <ebiggers@google.com>
Subject: [RFC PATCH 3/5] fscrypt: use EEXIST when file already uses different policy
Date: Mon,  5 Dec 2016 11:12:46 -0800	[thread overview]
Message-ID: <1480965168-38747-4-git-send-email-ebiggers@google.com> (raw)
In-Reply-To: <1480965168-38747-1-git-send-email-ebiggers@google.com>

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>
---
 fs/crypto/policy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c
index 1118f3a..4811539 100644
--- a/fs/crypto/policy.c
+++ b/fs/crypto/policy.c
@@ -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);
-- 
2.8.0.rc3.226.g39d4020


  parent reply	other threads:[~2016-12-05 19:12 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-05 19:12 [RFC PATCH 0/5] fscrypt error code cleanup Eric Biggers
2016-12-05 19:12 ` [RFC PATCH 1/5] fscrypt: use ENOKEY when file cannot be created w/o key Eric Biggers
2016-12-28  2:28   ` Theodore Ts'o
2016-12-05 19:12 ` [RFC PATCH 2/5] fscrypt: use ENOTDIR when setting encryption policy on nondirectory Eric Biggers
2016-12-28  2:28   ` Theodore Ts'o
2016-12-05 19:12 ` Eric Biggers [this message]
2016-12-28  2:29   ` [RFC PATCH 3/5] fscrypt: use EEXIST when file already uses different policy Theodore Ts'o
2016-12-05 19:12 ` [RFC PATCH 4/5] fscrypt: remove user-triggerable warning messages Eric Biggers
2016-12-28  3:14   ` Theodore Ts'o
2016-12-05 19:12 ` [RFC PATCH 5/5] fscrypt: pass up error codes from ->get_context() Eric Biggers
2016-12-28  3:26   ` Theodore Ts'o

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1480965168-38747-4-git-send-email-ebiggers@google.com \
    --to=ebiggers@google.com \
    --cc=david@sigma-star.at \
    --cc=jaegeuk@kernel.org \
    --cc=linux-ext4@vger.kernel.org \
    --cc=linux-f2fs-devel@lists.sourceforge.net \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=richard@nod.at \
    --cc=tytso@mit.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).