From patchwork Fri Nov 9 20:31:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1722091 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 514893FC8F for ; Fri, 9 Nov 2012 20:32:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755633Ab2KIUcD (ORCPT ); Fri, 9 Nov 2012 15:32:03 -0500 Received: from mail-vc0-f174.google.com ([209.85.220.174]:36169 "EHLO mail-vc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755388Ab2KIUcC (ORCPT ); Fri, 9 Nov 2012 15:32:02 -0500 Received: by mail-vc0-f174.google.com with SMTP id fk26so4210471vcb.19 for ; Fri, 09 Nov 2012 12:32:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=zf+rJ5ujwAtYOXhlzqsuXw0Q1ynIXj/b38s8VMhfj8s=; b=k22lhFEPexDhwu/u+KipQVnXWU2Zu9+9wI04SwwKqNMcbr0YWnvFsRD2aQ9WUt+IVu EEirSlQzJu48clBuZPOeoUvAtF9erHyXapBumSggpWvZX/FowYP8SNiCJkWMEDOLxU9o j42mZb7N/HVcfvc/6zEoZPWHSkSI20Riu1oPQfakzaPbIyWxYccmBRfhTqjAoZuZ50gG 9tye+uV0zXyy33Cmpygc1nCtW9SWV4L2ZYhuxWPCUgomQf6f0g7GvqE0ZG1g+o/mzvdc Gkuyl8Roof5nT9OSzoxK4nYpqhP/nuU+yLVlsg7VI8jf/3cnBTEah8NBxu8/ttgStbUY o7yA== Received: by 10.59.12.170 with SMTP id er10mr6635295ved.48.1352493121415; Fri, 09 Nov 2012 12:32:01 -0800 (PST) Received: from salusa.poochiereds.net (cpe-107-015-110-129.nc.res.rr.com. [107.15.110.129]) by mx.google.com with ESMTPS id jx16sm13971582veb.5.2012.11.09.12.31.58 (version=SSLv3 cipher=OTHER); Fri, 09 Nov 2012 12:31:58 -0800 (PST) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH] nfsd: fix error handling in nfsd4_remove_clid_dir Date: Fri, 9 Nov 2012 15:31:53 -0500 Message-Id: <1352493113-22005-1-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.7 X-Gm-Message-State: ALoCoQmq9l6kzFRhFjW0HC/VmQRHymAXG0LyESB/c4xR9zJ6LcwTL0eq0J7NO6Y94PdTUexx21r6 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org If the credential save fails, then we'll leak our mnt_want_write_file reference. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4recover.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c index 43295d4..0f1e2e2 100644 --- a/fs/nfsd/nfs4recover.c +++ b/fs/nfsd/nfs4recover.c @@ -301,12 +301,13 @@ nfsd4_remove_clid_dir(struct nfs4_client *clp) status = nfs4_save_creds(&original_cred); if (status < 0) - goto out; + goto out_drop_write; status = nfsd4_unlink_clid_dir(clp->cl_recdir, HEXDIR_LEN-1); nfs4_reset_creds(original_cred); if (status == 0) vfs_fsync(rec_file, 0); +out_drop_write: mnt_drop_write_file(rec_file); out: if (status)