Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp3680564ybl; Tue, 20 Aug 2019 00:13:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqxE+O3k/3LilK8ajUBBp6msTsaKPtNam6QDDa782ER3bUW7FbIxUjqKPK8XCW2mpPuBFYeQ X-Received: by 2002:a17:90a:8a11:: with SMTP id w17mr12907366pjn.139.1566285203917; Tue, 20 Aug 2019 00:13:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566285203; cv=none; d=google.com; s=arc-20160816; b=GuIjjPMgHcSvCwQ0GFTDWa8dDAuFeicd+0q8pUWNdlyfSZRL5gJhUAdjqI+9JlJtE2 WdW2lI3Tl7z2DJrqXI0kN9eZ+dj0rlWmv0VPs5GKMm3DP+7ITm2Cj+1JsC1gjN6N+T8D jivV2KhmxOAtcdfphDJNIRjGV9oaeJE7v9qeBPLCzOoaYcdi3qzhremM0MggpJQHytiz nqvl0OT3p8ZrqnQF2E0c2NJmRL0d3YKow47JHlfpxXAOwi77Dgbd6tjjLFyd5/zB8B25 pEqiacMVc3T6P8KGSD5npFvZV8UtUZcnbbb2jKNoIZXkxleFszDGwhIxOmJe2DlDW0RZ GO3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date; bh=r3UOMDyLfpUe45LxQrEQ+safSS9AVLkTM5ezbxD6Vcs=; b=Rj4t5kTT5GDl4kOsua8DuhxdlYzln34D3nuGOWAUschpEFXY4/BAGSHq1/JoRWEGbY iiZMqflhOdLuoNz+oLlmaB2+RkzvO58S9GSo5m8/VD/b/G5IHHpFpqiY5YBYA1WzHblx vfGGplTUEviHJL7jqnj7FyjxLuw7/drd3+cZ8t/pDfY0/0qxjhCosZqlAnztYJ04Hovd tYTQOJtSMXRAOptRl9o6rNioCak+zZu0jlBXC2qxRIsJ5Z6oUybibyAL0il10D0Hy8HC vLsf1l1pS6Hb9xBXrRmlZbfB5KrvHPZaVe5PH+m6JxGYmK2r/gZPFFL0Xg66aKxkX1nw TzcQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=canonical.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v10si11603776plo.384.2019.08.20.00.13.08; Tue, 20 Aug 2019 00:13:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729326AbfHTHL6 (ORCPT + 99 others); Tue, 20 Aug 2019 03:11:58 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:36731 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728777AbfHTHL5 (ORCPT ); Tue, 20 Aug 2019 03:11:57 -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 1hzyJ6-0001nu-Ta; Tue, 20 Aug 2019 07:11:53 +0000 Date: Tue, 20 Aug 2019 00:11:32 -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: <20190820071131.GB22824@elm> References: <1566279234-9634-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: <1566279234-9634-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:33:54, Wenwen Wang wrote: > In ecryptfs_init_messaging(), if the allocation for 'ecryptfs_msg_ctx_arr' > fails, the previously allocated 'ecryptfs_daemon_hash' is not deallocated, > leading to a memory leak bug. To fix this issue, free > 'ecryptfs_daemon_hash' before returning the error. > > Signed-off-by: Wenwen Wang Thanks for the patch! I added the following tags to the commit message: Cc: stable@vger.kernel.org Fixes: 88b4a07e6610 ("[PATCH] eCryptfs: Public key transport mechanism") 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/messaging.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/fs/ecryptfs/messaging.c b/fs/ecryptfs/messaging.c > index d668e60..c05ca39 100644 > --- a/fs/ecryptfs/messaging.c > +++ b/fs/ecryptfs/messaging.c > @@ -379,6 +379,7 @@ int __init ecryptfs_init_messaging(void) > * ecryptfs_message_buf_len), > GFP_KERNEL); > if (!ecryptfs_msg_ctx_arr) { > + kfree(ecryptfs_daemon_hash); > rc = -ENOMEM; > goto out; > } > -- > 2.7.4 >