From: Tyler Hicks <tyhicks@canonical.com>
To: Wenwen Wang <wenwen@cs.uga.edu>
Cc: "open list:ECRYPT FILE SYSTEM" <ecryptfs@vger.kernel.org>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] ecryptfs: fix a memory leak bug
Date: Tue, 20 Aug 2019 00:10:09 -0700 [thread overview]
Message-ID: <20190820071008.GA22824@elm> (raw)
In-Reply-To: <1566278200-9368-1-git-send-email-wenwen@cs.uga.edu>
On 2019-08-20 00:16:40, Wenwen Wang wrote:
> 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.
>
> Signed-off-by: Wenwen Wang <wenwen@cs.uga.edu>
Thanks for the patch!
I added the following tags to the commit message:
Cc: stable@vger.kernel.org
Fixes: dddfa461fc89 ("[PATCH] eCryptfs: Public key; packet management")
I also added the function name to the commit subject so that it was
unique from your other fix.
I've pushed the fix to the eCryptfs next branch and I'll submit a pull
request for inclusion soon.
Tyler
> ---
> fs/ecryptfs/keystore.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c
> index 216fbe6..4dc0963 100644
> --- a/fs/ecryptfs/keystore.c
> +++ b/fs/ecryptfs/keystore.c
> @@ -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)));
> --
> 2.7.4
>
next prev parent reply other threads:[~2019-08-20 7:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-20 5:16 [PATCH] ecryptfs: fix a memory leak bug Wenwen Wang
2019-08-20 7:10 ` Tyler Hicks [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-08-20 5:33 Wenwen Wang
2019-08-20 7:11 ` Tyler Hicks
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190820071008.GA22824@elm \
--to=tyhicks@canonical.com \
--cc=ecryptfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wenwen@cs.uga.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).