tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 88829dfe e6036c0b

+3 -2
+1 -1
fs/ecryptfs/crypto.c
··· 408 408 struct page *page) 409 409 { 410 410 return ecryptfs_lower_header_size(crypt_stat) + 411 - (page->index << PAGE_CACHE_SHIFT); 411 + ((loff_t)page->index << PAGE_CACHE_SHIFT); 412 412 } 413 413 414 414 /**
+2 -1
fs/ecryptfs/keystore.c
··· 1149 1149 struct ecryptfs_msg_ctx *msg_ctx; 1150 1150 struct ecryptfs_message *msg = NULL; 1151 1151 char *auth_tok_sig; 1152 - char *payload; 1152 + char *payload = NULL; 1153 1153 size_t payload_len = 0; 1154 1154 int rc; 1155 1155 ··· 1203 1203 } 1204 1204 out: 1205 1205 kfree(msg); 1206 + kfree(payload); 1206 1207 return rc; 1207 1208 } 1208 1209