From patchwork Thu Jan 26 20:57:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9540083 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8F282601D3 for ; Thu, 26 Jan 2017 20:57:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A62E28305 for ; Thu, 26 Jan 2017 20:57:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6B0C02831C; Thu, 26 Jan 2017 20:57:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA49828305 for ; Thu, 26 Jan 2017 20:57:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752973AbdAZU52 (ORCPT ); Thu, 26 Jan 2017 15:57:28 -0500 Received: from mail-it0-f65.google.com ([209.85.214.65]:33084 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752517AbdAZU51 (ORCPT ); Thu, 26 Jan 2017 15:57:27 -0500 Received: by mail-it0-f65.google.com with SMTP id e137so6348198itc.0 for ; Thu, 26 Jan 2017 12:57:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Zrsoj6JLol/7YyAadQjDiqSAVLUoJSJMHPLigGpW0bQ=; b=vL/kT1J7CYbPwMdq6YsaztHtYVr8e1fb+zuHGv6w0b/pqIjNVAkn3jMzHokPsBy5Vu md6ItxUWM+Bp/5GjtJb12KDsQve/IS5Hf9aoV6yDsrw7u+2zbeKwEVDrdM/Q8/f0aPlB SrjlJPbYwTTuw5fH80W4gg8ntjpUqiddLEugWeBsL/Yovp0vAEQktl01T8X0uS/KCjXA qhDWRMIaRGPAHKHlVPD4ZyNxGA/q20VucX6dCeNRaKIpuQFfNVoqTdaN/VBUcskNAXgG hkkQTJTFkPTmEvhVEG0vGTE0nwo6awLpjZU/fQLd1n6FkPcQkJ6Kfb1r8pzEx2ayZ7zX bMYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Zrsoj6JLol/7YyAadQjDiqSAVLUoJSJMHPLigGpW0bQ=; b=gpwNhfcFmJ6RY2bL96p0e8757W2kUvb4qkxwognHubgIbsp3+N9hvoWOygkFffIXHL aKeaF81Yzk3infnnj49z2A7gTPJTEIzc1k3UPyDHAo3YR1hmUOp7uIfCrhKjrvqsxBqG rJCxydD5exVQ13MO8Yn+qkZ5nSBVtM+H2JEAuIRdfRwZg/LyBP2Pyju4UoPn9rZgDDFS ezLPXrHV0Jr3Loh4Bne1CFCl4ors9o1v/FgAdAmyISPNN3vCQocUDzciZoYpmKA/oV4j AUO4b93X9S3mYg3nequifw6ObTKNc6/sJxJcCqRrFttqeNtRuLr1LfyKUozjGetYSyl4 +0og== X-Gm-Message-State: AIkVDXKEReyl84JTPxzvg32824Txy1YD+KwtoHX2J2MCZi+oE/3EbqgKhZ2jhW/zdGgU5g== X-Received: by 10.36.19.201 with SMTP id 192mr436409itz.30.1485464225345; Thu, 26 Jan 2017 12:57:05 -0800 (PST) Received: from localhost.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id d25sm2008786ioj.25.2017.01.26.12.57.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jan 2017 12:57:04 -0800 (PST) From: Trond Myklebust To: Olga Kornievskaia Cc: linux-nfs@vger.kernel.org Subject: [PATCH] pNFS: Fix a reference leak in _pnfs_return_layout Date: Thu, 26 Jan 2017 15:57:02 -0500 Message-Id: <20170126205702.7263-1-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: References: Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP IF NFS_LAYOUT_RETURN_REQUESTED is not set, then we currently exit without freeing the list of invalidated layout segments, leading to a reference leak. Reported-by: Olga Kornievskaia Fixes: 24408f5282 ("pNFS: Fix bugs in _pnfs_return_layout") Signed-off-by: Trond Myklebust --- fs/nfs/pnfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 59554f3adf29..dd042498ce7c 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1200,10 +1200,10 @@ _pnfs_return_layout(struct inode *ino) send = pnfs_prepare_layoutreturn(lo, &stateid, NULL); spin_unlock(&ino->i_lock); - pnfs_free_lseg_list(&tmp_list); if (send) status = pnfs_send_layoutreturn(lo, &stateid, IOMODE_ANY, true); out_put_layout_hdr: + pnfs_free_lseg_list(&tmp_list); pnfs_put_layout_hdr(lo); out: dprintk("<-- %s status: %d\n", __func__, status);