From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 Nov 2017 22:16:21 +0000 (-0800)
Subject: Merge tag 'ecryptfs-4.15-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.15-rc1~61
X-Git-Url: https://git.codelabs.ch/?p=muen%2Flinux.git;a=commitdiff_plain;h=e0bcb42e602816415f6fe07313b6fc84932244b7;hp=-c

Merge tag 'ecryptfs-4.15-rc1-fixes' of git://git./linux/kernel/git/tyhicks/ecryptfs

Pull eCryptfs updates from Tyler Hicks:

 - miscellaneous code cleanups and refactoring

 - fix a possible use after free bug when unloading the module

* tag 'ecryptfs-4.15-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
  eCryptfs: constify attribute_group structures.
  ecryptfs: remove unnecessary i_version bump
  ecryptfs: use ARRAY_SIZE
  ecryptfs: Adjust four checks for null pointers
  ecryptfs: Return an error code only as a constant in ecryptfs_add_global_auth_tok()
  ecryptfs: Delete 21 error messages for a failed memory allocation
  eCryptfs: use after free in ecryptfs_release_messaging()
  ecryptfs: remove private bin2hex implementation
  ecryptfs: add missing \n to end of various error messages
---

e0bcb42e602816415f6fe07313b6fc84932244b7
diff --combined fs/ecryptfs/main.c
index 25aeaa7328ba,d0b438eff82d..f2677c90d96e
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
@@@ -426,7 -426,7 +426,7 @@@ static int ecryptfs_parse_options(struc
  		mount_crypt_stat->global_default_cipher_key_size);
  	if (!cipher_code) {
  		ecryptfs_printk(KERN_ERR,
- 				"eCryptfs doesn't support cipher: %s",
+ 				"eCryptfs doesn't support cipher: %s\n",
  				mount_crypt_stat->global_default_cipher_name);
  		rc = -EINVAL;
  		goto out;
@@@ -660,7 -660,7 +660,7 @@@ static struct ecryptfs_cache_info 
  	struct kmem_cache **cache;
  	const char *name;
  	size_t size;
 -	unsigned long flags;
 +	slab_flags_t flags;
  	void (*ctor)(void *obj);
  } ecryptfs_cache_infos[] = {
  	{
@@@ -781,7 -781,7 +781,7 @@@ static struct attribute *attributes[] 
  	NULL,
  };
  
- static struct attribute_group attr_group = {
+ static const struct attribute_group attr_group = {
  	.attrs = attributes,
  };