From patchwork Mon Jul 7 14:10:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 4494941 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 38604BEEAA for ; Mon, 7 Jul 2014 14:11:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 67B56202E6 for ; Mon, 7 Jul 2014 14:11:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 97C7C20212 for ; Mon, 7 Jul 2014 14:11:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753814AbaGGOL4 (ORCPT ); Mon, 7 Jul 2014 10:11:56 -0400 Received: from mail-pd0-f172.google.com ([209.85.192.172]:55562 "EHLO mail-pd0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753503AbaGGOL4 (ORCPT ); Mon, 7 Jul 2014 10:11:56 -0400 Received: by mail-pd0-f172.google.com with SMTP id w10so5433364pde.17 for ; Mon, 07 Jul 2014 07:11:55 -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=ZZhWf3NZhDZPwYn9lnsJ7dyG002+2JMpyNVvN6XyM70=; b=RwU+zrywvaqb7xU8nIy2THFv2x7arIIpplj/vCGvyt4qQ7g8vfPW3sj/uZpAqnfwEx huo3d0H2BgT9ngHpY+zyxIMnt7HN1ogHUQk3BO+XAPsLl9ZeFfGrdThB9gKwkjNPDOM5 mYZdVfaa1N29nCOb07GhJTnL3tADDm6SZhqF09EmnNyvpUZQTM0ETzhyXx6Pdz5J/GJE 21zoeWeiHatZxHveKTx4IxZKMkEzZ0iqqn2m/wmHwcxx/33MuKmeNS4vigDFMGF4iJeG VkK8jLTKgk80eq+m0fJ8M0q/1HjOd3jRTDUEBfl6nDH62V+/xsnfA4+fgEwkE3IH8dm1 lRRg== X-Received: by 10.68.65.14 with SMTP id t14mr853067pbs.164.1404742315501; Mon, 07 Jul 2014 07:11:55 -0700 (PDT) Received: from [192.168.0.100] ([118.117.112.198]) by mx.google.com with ESMTPSA id kh7sm123516241pad.8.2014.07.07.07.11.50 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 07 Jul 2014 07:11:54 -0700 (PDT) Message-ID: <53BAAA70.1030602@gmail.com> Date: Mon, 07 Jul 2014 22:10:56 +0800 From: Kinglong Mee User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: "J. Bruce Fields" CC: Linux NFS Mailing List , kinglongmee@gmail.com Subject: [PATCH 1/4] NFSD: Fix memory leak in encoding denied lock 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 Commit 8c7424cff6 (nfsd4: don't try to encode conflicting owner if low on space) forgot free conf->data in nfsd4_encode_lockt and before sign conf->data to NULL in nfsd4_encode_lock_denied. Signed-off-by: Kinglong Mee --- fs/nfsd/nfs4xdr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 5a1d088..007e322 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -2884,6 +2884,7 @@ again: * return the conflicting open: */ if (conf->len) { + kfree(conf->data); conf->len = 0; conf->data = NULL; goto again; @@ -2896,6 +2897,7 @@ again: if (conf->len) { p = xdr_encode_opaque_fixed(p, &ld->ld_clientid, 8); p = xdr_encode_opaque(p, conf->data, conf->len); + kfree(conf->data); } else { /* non - nfsv4 lock in conflict, no clientid nor owner */ p = xdr_encode_hyper(p, (u64)0); /* clientid */ *p++ = cpu_to_be32(0); /* length of owner name */ @@ -2912,7 +2914,7 @@ nfsd4_encode_lock(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_lo nfserr = nfsd4_encode_stateid(xdr, &lock->lk_resp_stateid); else if (nfserr == nfserr_denied) nfserr = nfsd4_encode_lock_denied(xdr, &lock->lk_denied); - kfree(lock->lk_denied.ld_owner.data); + return nfserr; }