Commit 682a8e2b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ecryptfs-5.13-rc1-updates' of... 

Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs

Pull ecryptfs updates from Tyler Hicks:
 "Code cleanups and a bug fix

   - W=1 compiler warning cleanups

   - Mutex initialization simplification

   - Protect against NULL pointer exception during mount"

* tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
  ecryptfs: fix kernel panic with null dev_name
  ecryptfs: remove unused helpers
  ecryptfs: Fix typo in message
  eCryptfs: Use DEFINE_MUTEX() for mutex lock
  ecryptfs: keystore: Fix some kernel-doc issues and demote non-conformant headers
  ecryptfs: inode: Help out nearly-there header and demote non-conformant ones
  ecryptfs: mmap: Help out one function header and demote other abuses
  ecryptfs: crypto: Supply some missing param descriptions and demote abuses
  ecryptfs: miscdev: File headers are not good kernel-doc candidates
  ecryptfs: main: Demote a bunch of non-conformant kernel-doc headers
  ecryptfs: messaging: Add missing param descriptions and demote abuses
  ecryptfs: super: Fix formatting, naming and kernel-doc abuses
  ecryptfs: file: Demote kernel-doc abuses
  ecryptfs: kthread: Demote file header and provide description for 'cred'
  ecryptfs: dentry: File headers are not good candidates for kernel-doc
  ecryptfs: debug: Demote a couple of kernel-doc abuses
  ecryptfs: read_write: File headers do not make good candidates for kernel-doc
  ecryptfs: use DEFINE_MUTEX() for mutex lock
  eCryptfs: add a semicolon
parents 7ec901b6 90466255

fs/ecryptfs/crypto.c

+12 −13
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/**

/*

 * eCryptfs: Linux filesystem encryption layer

 *

 * Copyright (C) 1997-2004 Erez Zadok
@@ -350,7 +350,7 @@ static int crypt_scatterlist(struct ecryptfs_crypt_stat *crypt_stat, 
	return rc;

}



/**

/*

 * lower_offset_for_page

 *

 * Convert an eCryptfs page index into a lower byte offset
@@ -535,7 +535,7 @@ int ecryptfs_decrypt_page(struct page *page) 
		rc = crypt_extent(crypt_stat, page, page,

				  extent_offset, DECRYPT);

		if (rc) {

			printk(KERN_ERR "%s: Error encrypting extent; "

			printk(KERN_ERR "%s: Error decrypting extent; "

			       "rc = [%d]\n", __func__, rc);

			goto out;

		}
@@ -627,9 +627,8 @@ void ecryptfs_set_default_sizes(struct ecryptfs_crypt_stat *crypt_stat) 
	}

}



/**

/*

 * ecryptfs_compute_root_iv

 * @crypt_stats

 *

 * On error, sets the root IV to all 0's.

 */
@@ -1370,7 +1369,7 @@ int ecryptfs_read_and_validate_xattr_region(struct dentry *dentry, 
	return rc;

}



/**

/*

 * ecryptfs_read_metadata

 *

 * Common entry point for reading file metadata. From here, we could
@@ -1448,7 +1447,7 @@ int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry) 
	return rc;

}



/**

/*

 * ecryptfs_encrypt_filename - encrypt filename

 *

 * CBC-encrypts the filename. We do not want to encrypt the same
@@ -1590,11 +1589,10 @@ ecryptfs_process_key_cipher(struct crypto_skcipher **key_tfm, 


struct kmem_cache *ecryptfs_key_tfm_cache;

static struct list_head key_tfm_list;

struct mutex key_tfm_list_mutex;

DEFINE_MUTEX(key_tfm_list_mutex);



int __init ecryptfs_init_crypto(void)

{

	mutex_init(&key_tfm_list_mutex);

	INIT_LIST_HEAD(&key_tfm_list);

	return 0;

}
@@ -1877,10 +1875,11 @@ ecryptfs_decode_from_filename(unsigned char *dst, size_t *dst_size, 


/**

 * ecryptfs_encrypt_and_encode_filename - converts a plaintext file name to cipher text

 * @crypt_stat: The crypt_stat struct associated with the file anem to encode

 * @encoded_name: The encrypted name

 * @encoded_name_size: Length of the encrypted name

 * @mount_crypt_stat: The crypt_stat struct associated with the file name to encode

 * @name: The plaintext name

 * @length: The length of the plaintext

 * @encoded_name: The encypted name

 * @name_size: The length of the plaintext name

 *

 * Encrypts and encodes a filename into something that constitutes a

 * valid filename for a filesystem, with printable characters.
@@ -1992,7 +1991,7 @@ static bool is_dot_dotdot(const char *name, size_t name_size) 
 * ecryptfs_decode_and_decrypt_filename - converts the encoded cipher text name to decoded plaintext

 * @plaintext_name: The plaintext name

 * @plaintext_name_size: The plaintext name size

 * @ecryptfs_dir_dentry: eCryptfs directory dentry

 * @sb: Ecryptfs's super_block

 * @name: The filename in cipher text

 * @name_size: The cipher text name size

 *

fs/ecryptfs/debug.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/**

/*

 * eCryptfs: Linux filesystem encryption layer

 * Functions only useful for debugging.

 *
@@ -9,7 +9,7 @@ 


#include "ecryptfs_kernel.h"



/**

/*

 * ecryptfs_dump_auth_tok - debug function to print auth toks

 *

 * This function will print the contents of an ecryptfs authentication

fs/ecryptfs/dentry.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/**

/*

 * eCryptfs: Linux filesystem encryption layer

 *

 * Copyright (C) 1997-2003 Erez Zadok

fs/ecryptfs/ecryptfs_kernel.h

+1 −1
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ ecryptfs_dentry_to_lower_path(struct dentry *dentry) 
}



#define ecryptfs_printk(type, fmt, arg...) \

        __ecryptfs_printk(type "%s: " fmt, __func__, ## arg);

        __ecryptfs_printk(type "%s: " fmt, __func__, ## arg)

__printf(1, 2)

void __ecryptfs_printk(const char *fmt, ...);

fs/ecryptfs/file.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/**

/*

 * eCryptfs: Linux filesystem encryption layer

 *

 * Copyright (C) 1997-2004 Erez Zadok
@@ -19,7 +19,7 @@ 
#include <linux/fs_stack.h>

#include "ecryptfs_kernel.h"



/**

/*

 * ecryptfs_read_update_atime

 *

 * generic_file_read updates the atime of upper layer inode.  But, it