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

Commit 88829dfe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ecryptfs-3.12-rc7-fixes' of... 

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

Pull ecryptfs fixes from Tyler Hicks:
 "Two important fixes
   - Fix long standing memory leak in the (rarely used) public key
     support
   - Fix large file corruption on 32 bit architectures"

* tag 'ecryptfs-3.12-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
  eCryptfs: fix 32 bit corruption issue
  ecryptfs: Fix memory leakage in keystore.c
parents e6036c0b 43b7c6c6

fs/ecryptfs/crypto.c

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ static loff_t lower_offset_for_page(struct ecryptfs_crypt_stat *crypt_stat, 
				    struct page *page)

{

	return ecryptfs_lower_header_size(crypt_stat) +

	       (page->index << PAGE_CACHE_SHIFT);

	       ((loff_t)page->index << PAGE_CACHE_SHIFT);

}



/**

fs/ecryptfs/keystore.c

+2 −1
Original line number Diff line number Diff line
@@ -1149,7 +1149,7 @@ decrypt_pki_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok, 
	struct ecryptfs_msg_ctx *msg_ctx;

	struct ecryptfs_message *msg = NULL;

	char *auth_tok_sig;

	char *payload;

	char *payload = NULL;

	size_t payload_len = 0;

	int rc;
@@ -1203,6 +1203,7 @@ decrypt_pki_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok, 
	}

out:

	kfree(msg);

	kfree(payload);

	return rc;

}