Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25bd8174 authored by Michael Halcrow's avatar Michael Halcrow Committed by Linus Torvalds
Browse files

eCryptfs: Minor fixes to printk messages 



The printk statements that result when the user does not have the
proper key available could use some refining.

Signed-off-by: default avatarMike Halcrow <mhalcrow@us.ibm.com>
Cc: Mike Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2830bfd6

fs/ecryptfs/crypto.c

+4 −3
Original line number Diff line number Diff line
@@ -1527,9 +1527,10 @@ int ecryptfs_read_xattr_region(char *page_virt, struct inode *ecryptfs_inode) 
	size = ecryptfs_getxattr_lower(lower_dentry, ECRYPTFS_XATTR_NAME,

				       page_virt, ECRYPTFS_DEFAULT_EXTENT_SIZE);

	if (size < 0) {

		printk(KERN_ERR "Error attempting to read the [%s] "

		       "xattr from the lower file; return value = [%zd]\n",

		       ECRYPTFS_XATTR_NAME, size);

		if (unlikely(ecryptfs_verbosity > 0))

			printk(KERN_INFO "Error attempting to read the [%s] "

			       "xattr from the lower file; return value = "

			       "[%zd]\n", ECRYPTFS_XATTR_NAME, size);

		rc = -EINVAL;

		goto out;

	}

fs/ecryptfs/file.c

+3 −2
Original line number Diff line number Diff line
@@ -209,9 +209,10 @@ static int ecryptfs_open(struct inode *inode, struct file *file) 
			if (!(mount_crypt_stat->flags

			      & ECRYPTFS_PLAINTEXT_PASSTHROUGH_ENABLED)) {

				rc = -EIO;

				printk(KERN_WARNING "Attempt to read file that "

				printk(KERN_WARNING "Either the lower file "

				       "is not in a valid eCryptfs format, "

				       "and plaintext passthrough mode is not "

				       "or the key could not be retrieved. "

				       "Plaintext passthrough mode is not "

				       "enabled; returning -EIO\n");

				mutex_unlock(&crypt_stat->cs_mutex);

				goto out_free;

fs/ecryptfs/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -873,11 +873,11 @@ static int ecryptfs_setattr(struct dentry *dentry, struct iattr *ia) 
			if (!(mount_crypt_stat->flags

			      & ECRYPTFS_PLAINTEXT_PASSTHROUGH_ENABLED)) {

				rc = -EIO;

				printk(KERN_WARNING "Attempt to read file that "

				printk(KERN_WARNING "Either the lower file "

				       "is not in a valid eCryptfs format, "

				       "and plaintext passthrough mode is not "

				       "or the key could not be retrieved. "

				       "Plaintext passthrough mode is not "

				       "enabled; returning -EIO\n");



				mutex_unlock(&crypt_stat->cs_mutex);

				goto out;

			}