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=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 E2741C3A589 for ; Tue, 20 Aug 2019 09:51:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A9D1D22CF9 for ; Tue, 20 Aug 2019 09:51:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566294686; bh=K8sJJxvvQKJl8QWVEqPaTDFCFZYjha7QbbMLOeXPdr0=; h=Subject:From:To:Cc:Date:In-Reply-To:References:List-ID:From; b=I3jaS1//qAYemj0ncW8iy6WTeNeyRMxTA0d8ZeKiuipm2hyUzZSWCzlnvZSzuSDBX ZUWCIhOwkr/TqAqpdQPABH3nmv0TXCujQs2ARdt+ymWXRAv1R325Q7pN9MMucJTU3t c71AAzvIP2Xz0QRbZMh5bFDWEzpmPfpj5Z8L4g9Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729764AbfHTJvZ (ORCPT ); Tue, 20 Aug 2019 05:51:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:59726 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729396AbfHTJvZ (ORCPT ); Tue, 20 Aug 2019 05:51:25 -0400 Received: from tleilax.poochiereds.net (68-20-15-154.lightspeed.rlghnc.sbcglobal.net [68.20.15.154]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 882EE22CF7; Tue, 20 Aug 2019 09:51:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566294684; bh=K8sJJxvvQKJl8QWVEqPaTDFCFZYjha7QbbMLOeXPdr0=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=JCTVilkLtjMxPIUYr5HeBTQrzW68s+3jJ+9gXUohRnN7k1WBZ8mJrUKi10fRmqwnK s1F1eZIqCwofauy6ozMJQgUYs4EK1MQ9pvitZT8lS1JNq372YojVinHVCAggYt8T1x BBBa8l+5n90TkzXSdDoO+GXS2ajz9gEu2HAn1xGc= Message-ID: <25478fb3102ecebe09297948dcbb666c22845de1.camel@kernel.org> Subject: Re: [PATCH] locks: fix a memory leak bug From: Jeff Layton To: Wenwen Wang Cc: Alexander Viro , "J. Bruce Fields" , "open list:FILESYSTEMS (VFS and infrastructure)" , open list Date: Tue, 20 Aug 2019 05:51:22 -0400 In-Reply-To: <1566258454-7684-1-git-send-email-wenwen@cs.uga.edu> References: <1566258454-7684-1-git-send-email-wenwen@cs.uga.edu> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.32.4 (3.32.4-1.fc30) MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2019-08-19 at 18:47 -0500, Wenwen Wang wrote: > In __break_lease(), the file lock 'new_fl' is allocated in lease_alloc(). > However, it is not deallocated in the following execution if > smp_load_acquire() fails, leading to a memory leak bug. To fix this issue, > free 'new_fl' before returning the error. > > Signed-off-by: Wenwen Wang > --- > fs/locks.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/fs/locks.c b/fs/locks.c > index 686eae2..5993b2a 100644 > --- a/fs/locks.c > +++ b/fs/locks.c > @@ -1592,7 +1592,7 @@ int __break_lease(struct inode *inode, unsigned int mode, unsigned int type) > ctx = smp_load_acquire(&inode->i_flctx); > if (!ctx) { > WARN_ON_ONCE(1); > - return error; > + goto free_lock; > } > > percpu_down_read(&file_rwsem); > @@ -1672,6 +1672,7 @@ int __break_lease(struct inode *inode, unsigned int mode, unsigned int type) > spin_unlock(&ctx->flc_lock); > percpu_up_read(&file_rwsem); > locks_dispose_list(&dispose); > +free_lock: > locks_free_lock(new_fl); > return error; > } Good catch! Merged for v5.4. Let me know if you think this needs to go in earlier and/or to stable kernels. Thanks, -- Jeff Layton