From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 7 Nov 2015 00:23:27 +0000 (-0800)
Subject: Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=713009809681e5a7871e96e6992692c805b4480b;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'ext4_for_linus' of git://git./linux/kernel/git/tytso/ext4

Pull ext4 updates from Ted Ts'o:
 "Add support for the CSUM_SEED feature which will allow future
  userspace utilities to change the file system's UUID without rewriting
  all of the file system metadata.

  A number of miscellaneous fixes, the most significant of which are in
  the ext4 encryption support.  Anyone wishing to use the encryption
  feature should backport all of the ext4 crypto patches up to 4.4 to
  get fixes to a memory leak and file system corruption bug.

  There are also cleanups in ext4's feature test macros and in ext4's
  sysfs support code"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (26 commits)
  fs/ext4: remove unnecessary new_valid_dev check
  ext4: fix abs() usage in ext4_mb_check_group_pa
  ext4: do not allow journal_opts for fs w/o journal
  ext4: explicit mount options parsing cleanup
  ext4, jbd2: ensure entering into panic after recording an error in superblock
  [PATCH] fix calculation of meta_bg descriptor backups
  ext4: fix potential use after free in __ext4_journal_stop
  jbd2: fix checkpoint list cleanup
  ext4: fix xfstest generic/269 double revoked buffer bug with bigalloc
  ext4: make the bitmap read routines return real error codes
  jbd2: clean up feature test macros with predicate functions
  ext4: clean up feature test macros with predicate functions
  ext4: call out CRC and corruption errors with specific error codes
  ext4: store checksum seed in superblock
  ext4: reserve code points for the project quota feature
  ext4: promote ext4 over ext2 in the default probe order
  jbd2: gate checksum calculations on crc driver presence, not sb flags
  ext4: use private version of page_zero_new_buffers() for data=journal mode
  ext4 crypto: fix bugs in ext4_encrypted_zeroout()
  ext4 crypto: replace some BUG_ON()'s with error checks
  ...
---

713009809681e5a7871e96e6992692c805b4480b
diff --cc fs/ext4/crypto_key.c
index 5c52c79dea46,f9270ec2a132..c5882b36e558
--- a/fs/ext4/crypto_key.c
+++ b/fs/ext4/crypto_key.c
@@@ -208,8 -207,13 +207,13 @@@ retry
  		goto out;
  	}
  	crypt_info->ci_keyring_key = keyring_key;
- 	BUG_ON(keyring_key->type != &key_type_logon);
+ 	if (keyring_key->type != &key_type_logon) {
+ 		printk_once(KERN_WARNING
+ 			    "ext4: key type must be logon\n");
+ 		res = -ENOKEY;
+ 		goto out;
+ 	}
 -	ukp = ((struct user_key_payload *)keyring_key->payload.data);
 +	ukp = user_key_payload(keyring_key);
  	if (ukp->datalen != sizeof(struct ext4_encryption_key)) {
  		res = -EINVAL;
  		goto out;