Commit b1da3acc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ecryptfs-5.6-rc3-fixes' of... 

Merge tag 'ecryptfs-5.6-rc3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs

Pull eCryptfs fixes from Tyler Hicks:

 - downgrade the eCryptfs maintenance status to "Odd Fixes"

 - change my email address

 - fix a couple memory leaks in error paths

 - stability improvement to avoid a needless BUG_ON()

* tag 'ecryptfs-5.6-rc3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
  ecryptfs: replace BUG_ON with error handling code
  eCryptfs: Replace deactivated email address
  MAINTAINERS: eCryptfs: Update maintainer address and downgrade status
  ecryptfs: fix a memory leak bug in ecryptfs_init_messaging()
  ecryptfs: fix a memory leak bug in parse_tag_1_packet()
parents eaea2947 2c2a7552

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -5932,12 +5932,12 @@ S: Maintained 
F:	drivers/media/dvb-frontends/ec100*















ECRYPT FILE SYSTEM













M:	Tyler Hicks <tyhicks@canonical.com>













M:	Tyler Hicks <code@tyhicks.com>















L:	ecryptfs@vger.kernel.org















W:	http://ecryptfs.org















W:	https://launchpad.net/ecryptfs















T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git













S:	Supported













S:	Odd Fixes















F:	Documentation/filesystems/ecryptfs.txt















F:	fs/ecryptfs/















































fs/ecryptfs/crypto.c



+4
−2






























Original line number
Diff line number
Diff line








@@ -311,8 +311,10 @@ static int crypt_scatterlist(struct ecryptfs_crypt_stat *crypt_stat,













	struct extent_crypt_result ecr;















	int rc = 0;





























	BUG_ON(!crypt_stat || !crypt_stat->tfm













	       || !(crypt_stat->flags & ECRYPTFS_STRUCT_INITIALIZED));













	if (!crypt_stat || !crypt_stat->tfm













	       || !(crypt_stat->flags & ECRYPTFS_STRUCT_INITIALIZED))













		return -EINVAL;





























	if (unlikely(ecryptfs_verbosity > 0)) {















		ecryptfs_printk(KERN_DEBUG, "Key size [%zd]; key:\n",















				crypt_stat->key_size);

































fs/ecryptfs/ecryptfs_kernel.h



+1
−1






























Original line number
Diff line number
Diff line








@@ -8,7 +8,7 @@













 * Copyright (C) 2004-2008 International Business Machines Corp.















 *   Author(s): Michael A. Halcrow <mahalcro@us.ibm.com>















 *              Trevor S. Highland <trevor.highland@gmail.com>













 *              Tyler Hicks <tyhicks@ou.edu>













 *              Tyler Hicks <code@tyhicks.com>















 */































#ifndef ECRYPTFS_KERNEL_H

































fs/ecryptfs/keystore.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -1304,7 +1304,7 @@ parse_tag_1_packet(struct ecryptfs_crypt_stat *crypt_stat,













		printk(KERN_WARNING "Tag 1 packet contains key larger "















		       "than ECRYPTFS_MAX_ENCRYPTED_KEY_BYTES\n");















		rc = -EINVAL;













		goto out;













		goto out_free;















	}















	memcpy((*new_auth_tok)->session_key.encrypted_key,















	       &data[(*packet_size)], (body_size - (ECRYPTFS_SIG_SIZE + 2)));

































fs/ecryptfs/main.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -7,7 +7,7 @@













 * Copyright (C) 2004-2007 International Business Machines Corp.















 *   Author(s): Michael A. Halcrow <mahalcro@us.ibm.com>















 *              Michael C. Thompson <mcthomps@us.ibm.com>













 *              Tyler Hicks <tyhicks@ou.edu>













 *              Tyler Hicks <code@tyhicks.com>















 */































#include <linux/dcache.h>









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE