From patchwork Tue Sep 2 14:12:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 4826101 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 64BDAC0338 for ; Tue, 2 Sep 2014 14:12:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4E69F20160 for ; Tue, 2 Sep 2014 14:12:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2A1342009C for ; Tue, 2 Sep 2014 14:12:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750963AbaIBOMj (ORCPT ); Tue, 2 Sep 2014 10:12:39 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:46692 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753540AbaIBOMi (ORCPT ); Tue, 2 Sep 2014 10:12:38 -0400 Received: by mail-pa0-f49.google.com with SMTP id kq14so14871590pab.36 for ; Tue, 02 Sep 2014 07:12:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; bh=mgzJ+DO+0yO5c1fHh/qyFsKJaVQJIPO0Nl2Na9W1hwk=; b=zqaPLfu9sWUUhE8KDugrZxA4e3LyTslrV221ailAlbuvYqB1EPxetzNCRDmMZv29C4 to42Ebf7eWiocLYOaKRJk2pYGqvQMY1LaWQzCEeupCWIlhSjU1emeXcuvNyMeqT4YgXN Wl6qmqeYhGshTJ63/5Hl62GzOFV94yOGagouWLxISCY015un1JUde3raMBqvejVoVb83 AeSeDPi2HqAlxwouTLUF4xI+xDy/ajyPk5MHcN2nmjbHqoyAsjRU8kD2jnwxPVv6+mmW aXM52eMQ2dQ2GxoifucDW3g4Bp6Jmp0QhZzFCKKpI219+BOQxpRJBw5vT86jSfG6d7kn k2ow== X-Received: by 10.70.102.175 with SMTP id fp15mr47781707pdb.52.1409667158503; Tue, 02 Sep 2014 07:12:38 -0700 (PDT) Received: from [192.168.0.100] ([171.92.20.104]) by mx.google.com with ESMTPSA id ow8sm4111554pbb.62.2014.09.02.07.12.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Sep 2014 07:12:37 -0700 (PDT) Message-ID: <5405D041.4060303@gmail.com> Date: Tue, 02 Sep 2014 22:12:17 +0800 From: Kinglong Mee User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: "J. Bruce Fields" CC: Linux NFS Mailing List , Kinglong Mee Subject: [PATCH 3/6] NFSD: Fix a memory leak if nfsd4_recdir_load fail Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-8.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Kinglong Mee --- fs/nfsd/nfs4recover.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c index e37ac1c..bb66037 100644 --- a/fs/nfsd/nfs4recover.c +++ b/fs/nfsd/nfs4recover.c @@ -480,6 +480,16 @@ nfsd4_init_recdir(struct net *net) return status; } +static void +nfsd4_shutdown_recdir(struct net *net) +{ + struct nfsd_net *nn = net_generic(net, nfsd_net_id); + + if (!nn->rec_file) + return; + fput(nn->rec_file); + nn->rec_file = NULL; +} static int nfs4_legacy_state_init(struct net *net) @@ -513,10 +523,13 @@ nfsd4_load_reboot_recovery_data(struct net *net) int status; status = nfsd4_init_recdir(net); - if (!status) - status = nfsd4_recdir_load(net); if (status) - printk(KERN_ERR "NFSD: Failure reading reboot recovery data\n"); + return status; + + status = nfsd4_recdir_load(net); + if (status) + nfsd4_shutdown_recdir(net); + return status; } @@ -547,21 +560,12 @@ err: } static void -nfsd4_shutdown_recdir(struct nfsd_net *nn) -{ - if (!nn->rec_file) - return; - fput(nn->rec_file); - nn->rec_file = NULL; -} - -static void nfsd4_legacy_tracking_exit(struct net *net) { struct nfsd_net *nn = net_generic(net, nfsd_net_id); nfs4_release_reclaim(nn); - nfsd4_shutdown_recdir(nn); + nfsd4_shutdown_recdir(net); nfs4_legacy_state_shutdown(net); }