| From a1c0d4d5c71f2b393556d7185b89b0fcc22e7121 Mon Sep 17 00:00:00 2001 |
| From: Wenwen Wang <wenwen@cs.uga.edu> |
| Date: Tue, 20 Aug 2019 00:16:40 -0500 |
| Subject: [PATCH] ecryptfs: fix a memory leak bug in parse_tag_1_packet() |
| |
| commit fe2e082f5da5b4a0a92ae32978f81507ef37ec66 upstream. |
| |
| In parse_tag_1_packet(), if tag 1 packet contains a key larger than |
| ECRYPTFS_MAX_ENCRYPTED_KEY_BYTES, no cleanup is executed, leading to a |
| memory leak on the allocated 'auth_tok_list_item'. To fix this issue, go to |
| the label 'out_free' to perform the cleanup work. |
| |
| Cc: stable@vger.kernel.org |
| Fixes: dddfa461fc89 ("[PATCH] eCryptfs: Public key; packet management") |
| Signed-off-by: Wenwen Wang <wenwen@cs.uga.edu> |
| Signed-off-by: Tyler Hicks <tyhicks@canonical.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c |
| index 9536e592e25a..7cd6db598e9f 100644 |
| --- a/fs/ecryptfs/keystore.c |
| +++ b/fs/ecryptfs/keystore.c |
| @@ -1303,7 +1303,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))); |
| -- |
| 2.7.4 |
| |
