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

Commit 0747fdb2 authored by Al Viro's avatar Al Viro
Browse files

ecryptfs: switch ecryptfs_decode_and_decrypt_filename() from dentry to sb 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent cb5e05d1

fs/ecryptfs/crypto.c

+2 −3
Original line number Diff line number Diff line
@@ -2243,12 +2243,11 @@ int ecryptfs_encrypt_and_encode_filename( 
 */

int ecryptfs_decode_and_decrypt_filename(char **plaintext_name,

					 size_t *plaintext_name_size,

					 struct dentry *ecryptfs_dir_dentry,

					 struct super_block *sb,

					 const char *name, size_t name_size)

{

	struct ecryptfs_mount_crypt_stat *mount_crypt_stat =

		&ecryptfs_superblock_to_private(

			ecryptfs_dir_dentry->d_sb)->mount_crypt_stat;

		&ecryptfs_superblock_to_private(sb)->mount_crypt_stat;

	char *decoded_name;

	size_t decoded_name_size;

	size_t packet_size;

fs/ecryptfs/ecryptfs_kernel.h

+1 −1
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ int ecryptfs_initialize_file(struct dentry *ecryptfs_dentry, 
			     struct inode *ecryptfs_inode);

int ecryptfs_decode_and_decrypt_filename(char **decrypted_name,

					 size_t *decrypted_name_size,

					 struct dentry *ecryptfs_dentry,

					 struct super_block *sb,

					 const char *name, size_t name_size);

int ecryptfs_fill_zeros(struct file *file, loff_t new_length);

int ecryptfs_encrypt_and_encode_filename(

fs/ecryptfs/file.c

+4 −5
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static ssize_t ecryptfs_read_update_atime(struct kiocb *iocb, 
struct ecryptfs_getdents_callback {

	struct dir_context ctx;

	struct dir_context *caller;

	struct dentry *dentry;

	struct super_block *sb;

	int filldir_called;

	int entries_written;

};
@@ -88,7 +88,7 @@ ecryptfs_filldir(void *dirent, const char *lower_name, int lower_namelen, 


	buf->filldir_called++;

	rc = ecryptfs_decode_and_decrypt_filename(&name, &name_size,

						  buf->dentry, lower_name,

						  buf->sb, lower_name,

						  lower_namelen);

	if (rc) {

		printk(KERN_ERR "%s: Error attempting to decode and decrypt "
@@ -114,15 +114,14 @@ static int ecryptfs_readdir(struct file *file, struct dir_context *ctx) 
{

	int rc;

	struct file *lower_file;

	struct inode *inode;

	struct inode *inode = file_inode(file);

	struct ecryptfs_getdents_callback buf = {

		.ctx.actor = ecryptfs_filldir,

		.caller = ctx,

		.dentry = file->f_path.dentry

		.sb = inode->i_sb,

	};

	lower_file = ecryptfs_file_to_lower(file);

	lower_file->f_pos = ctx->pos;

	inode = file_inode(file);

	rc = iterate_dir(lower_file, &buf.ctx);

	ctx->pos = buf.ctx.pos;

	if (rc < 0)

fs/ecryptfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -679,7 +679,7 @@ static int ecryptfs_readlink_lower(struct dentry *dentry, char **buf, 
	set_fs(old_fs);

	if (rc < 0)

		goto out;

	rc = ecryptfs_decode_and_decrypt_filename(buf, bufsiz, dentry,

	rc = ecryptfs_decode_and_decrypt_filename(buf, bufsiz, dentry->d_sb,

						  lower_buf, rc);

out:

	kfree(lower_buf);