fscrypt: remove user-triggerable warning messages

Several warning messages were not rate limited and were user-triggerable
from FS_IOC_SET_ENCRYPTION_POLICY.  These shouldn't really have been
there in the first place, but either way they aren't as useful now that
the error codes have been improved.  So just remove them.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c
index 47f19800ceb7e935c5a7eac0daa5e35dd0a783dc..521b182dd902756d24a9cf382e70517b5668f206 100644 (file)
--- a/fs/crypto/policy.c
+++ b/fs/crypto/policy.c
@@ -66,20 +66,12 @@ static int create_encryption_context_from_policy(struct inode *inode,
                                        FS_KEY_DESCRIPTOR_SIZE);
 
        if (!fscrypt_valid_contents_enc_mode(
-                               policy->contents_encryption_mode)) {
-               printk(KERN_WARNING
-                      "%s: Invalid contents encryption mode %d\n", __func__,
-                       policy->contents_encryption_mode);
+                               policy->contents_encryption_mode))
                return -EINVAL;
-       }
 
        if (!fscrypt_valid_filenames_enc_mode(
-                               policy->filenames_encryption_mode)) {
-               printk(KERN_WARNING
-                       "%s: Invalid filenames encryption mode %d\n", __func__,
-                       policy->filenames_encryption_mode);
+                               policy->filenames_encryption_mode))
                return -EINVAL;
-       }
 
        if (policy->flags & ~FS_POLICY_FLAGS_VALID)
                return -EINVAL;
@@ -126,9 +118,6 @@ int fscrypt_ioctl_set_policy(struct file *filp, const void __user *arg)
                                                                    &policy);
        } else if (!is_encryption_context_consistent_with_policy(inode,
                                                                 &policy)) {
-               printk(KERN_WARNING
-                      "%s: Policy inconsistent with encryption context\n",
-                      __func__);
                ret = -EEXIST;
        }