From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD28AC3A589 for ; Tue, 20 Aug 2019 07:10:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 870E6214DA for ; Tue, 20 Aug 2019 07:10:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729288AbfHTHKc (ORCPT ); Tue, 20 Aug 2019 03:10:32 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:36720 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728777AbfHTHKc (ORCPT ); Tue, 20 Aug 2019 03:10:32 -0400 Received: from 1.general.tyhicks.us.vpn ([10.172.64.52] helo=elm) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1hzyHl-0001hm-T2; Tue, 20 Aug 2019 07:10:30 +0000 Date: Tue, 20 Aug 2019 00:10:09 -0700 From: Tyler Hicks To: Wenwen Wang Cc: "open list:ECRYPT FILE SYSTEM" , open list Subject: Re: [PATCH] ecryptfs: fix a memory leak bug Message-ID: <20190820071008.GA22824@elm> References: <1566278200-9368-1-git-send-email-wenwen@cs.uga.edu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1566278200-9368-1-git-send-email-wenwen@cs.uga.edu> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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 >