From patchwork Fri Jul 3 11:32:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 6714391 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 492EAC05AC for ; Fri, 3 Jul 2015 11:32:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 798F8207F6 for ; Fri, 3 Jul 2015 11:32:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AB42A207F3 for ; Fri, 3 Jul 2015 11:32:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755143AbbGCLcU (ORCPT ); Fri, 3 Jul 2015 07:32:20 -0400 Received: from mail-pd0-f180.google.com ([209.85.192.180]:33483 "EHLO mail-pd0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754823AbbGCLcT (ORCPT ); Fri, 3 Jul 2015 07:32:19 -0400 Received: by pdjd13 with SMTP id d13so62602469pdj.0 for ; Fri, 03 Jul 2015 04:32:18 -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=50HQAmlY86pm9Xkm2EcpOwqZuAqWmBDfIWrKWb70wzY=; b=Mvyg3CN5oxldqLQgUy5XRJtip2ph+120/EY4FJ2i8E6WNkpROC4acvgoC5x/tjH8X4 Xcs88N/L5o+Dq1g8jgd71KuAPHz8UMRbzp1lgDW3kH/aCZMO/XtD7lAOntE9meQsHmAo bTUWNZXnV0gK0pWxuShNmYOlaWICWiAbcXtSU7dQY/2kDxEsAWz/MZ0gl7th8OHCnXa3 2dsaY8ZCr9y6CIlE6tkN3A9HKuvK6NTawx03413ThZL1CskgXVz3rQKbUcwIawDsxeB8 AYNHR9KbzRDMs3wGxWhxR6QHU3oYppmcy3GgREMINnnJM8Fa9zL0+mNUxHpt3jsaZs+k rBNA== X-Received: by 10.66.121.101 with SMTP id lj5mr75468146pab.113.1435923138843; Fri, 03 Jul 2015 04:32:18 -0700 (PDT) Received: from [192.168.99.20] ([104.143.41.79]) by mx.google.com with ESMTPSA id x2sm8814912pda.31.2015.07.03.04.32.16 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Jul 2015 04:32:18 -0700 (PDT) Message-ID: <559672B7.4010802@gmail.com> Date: Fri, 03 Jul 2015 19:32:07 +0800 From: Kinglong Mee User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: "J. Bruce Fields" , "linux-nfs@vger.kernel.org" CC: Christoph Hellwig , kinglongmee@gmail.com Subject: [PATCH 1/5] nfsd: Fix a file leak of ls_file if nfsd4_layout_setlease 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=-7.4 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 If nfsd4_layout_setlease fail, nfsd will not put ls->ls_file. Fix commit c5c707f96f "nfsd: implement pNFS layout recalls". Signed-off-by: Kinglong Mee --- fs/nfsd/nfs4layouts.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c index 6904213..367a65a 100644 --- a/fs/nfsd/nfs4layouts.c +++ b/fs/nfsd/nfs4layouts.c @@ -212,8 +212,7 @@ nfsd4_alloc_layout_stateid(struct nfsd4_compound_state *cstate, BUG_ON(!ls->ls_file); if (nfsd4_layout_setlease(ls)) { - put_nfs4_file(fp); - kmem_cache_free(nfs4_layout_stateid_cache, ls); + nfs4_put_stid(stp); return NULL; }