From patchwork Mon Mar 18 17:00:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catalin Marinas X-Patchwork-Id: 160503 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp2875734jad; Mon, 18 Mar 2019 10:00:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqwXWaa1DotamYRBpj+WSMCTQ4m7p/mXfaNtDlSIAvNdmmC3XolLHyegpGF0L0KPd6bhAhaS X-Received: by 2002:a62:bd09:: with SMTP id a9mr19797748pff.61.1552928438187; Mon, 18 Mar 2019 10:00:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552928438; cv=none; d=google.com; s=arc-20160816; b=Dyvq4UmFSKsc9WvDp5FowPySGt58NPda4OoW+VCzy29DPdFN2r4iQi86yrOPS2Ajns m2OCkiO+GldbGd97NJI4bUc3+qM7vh70hyeRgovU3j1alJDdOEvkYWRWQLprUSo5t+gx ZLN+Gv3MkXgDnU8O1hJYJ5PI3A/Hswr+YOLFgdB7Ne3y3hdN53fYrqdnY3Dd3+zGNOZR vthpxNTQ3U2MSL8DhqqCXyCCs6Zc721VxqXpXb8g4Ye/RzikyFxckg1s2OgPz4GOe73P vja/sXp3NyESX1LMWnMAlWuogbj1ZANCl3ZxFY+ul3bABgAIoAO+ord9bY7setmUlrpC up+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=H6xPNpJfBWiO+5qMjlMz1dxY+cwBc/43iPnc5C8YT4M=; b=wQ0Twyi6O11u1YOLOXITvRnsSVjHt2vF3SCms9fEFukUKGkFRnDHB7rCqQvPclNu0y LzCR4Xq7Z/fcBgYRaavw/5WqWofrhwzs3XNZE4E5JhPs2RBhYN00TwutVqC++zs8fLWB cne6Nmx3q0/7pqm0r6OBriXRjb+wP7gFcT5Miw3rUGHzAYW014ca2EZ5Wd92w57yQUsE W5AAQNrpgCapqYWHQVYjUi8BDgeZxCwemzjTL2KH6GgEZ345lAz0FV0xaNa4BHN2BaYi /RG3vaST6ynzlwnkQcEgjZajcgMG095JKnlShicMLp2PZo1D03YrUZdO4/pjIEovIzWf bc1w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x14si9192694pfa.239.2019.03.18.10.00.37; Mon, 18 Mar 2019 10:00:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727847AbfCRRAh (ORCPT + 31 others); Mon, 18 Mar 2019 13:00:37 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:37872 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727142AbfCRRAf (ORCPT ); Mon, 18 Mar 2019 13:00:35 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4B3F01650; Mon, 18 Mar 2019 10:00:35 -0700 (PDT) Received: from arrakis.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id E7E473F614; Mon, 18 Mar 2019 10:00:33 -0700 (PDT) From: Catalin Marinas To: linux-nfs@vger.kernel.org Cc: linux-kernel@vger.kernel.org, trond.myklebust@hammerspace.com, anna.schumaker@netapp.com, stable@vger.kernel.org, NeilBrown Subject: [PATCH] NFS: Fix nfs4_lock_state refcounting in nfs4_alloc_{lock, unlock}data() Date: Mon, 18 Mar 2019 17:00:28 +0000 Message-Id: <20190318170028.61423-1-catalin.marinas@arm.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 7b587e1a5a6c ("NFS: use locks_copy_lock() to copy locks.") changed the lock copying from memcpy() to the dedicated locks_copy_lock() function. The latter correctly increments the nfs4_lock_state.ls_count via nfs4_fl_copy_lock(), however, this refcount has already been incremented in the nfs4_alloc_{lock,unlock}data(). Kmemleak subsequently reports an unreferenced nfs4_lock_state object as below (arm64 platform): unreferenced object 0xffff8000fce0b000 (size 256): comm "systemd-sysuser", pid 1608, jiffies 4294892825 (age 32.348s) hex dump (first 32 bytes): 20 57 4c fb 00 80 ff ff 20 57 4c fb 00 80 ff ff WL..... WL..... 00 57 4c fb 00 80 ff ff 01 00 00 00 00 00 00 00 .WL............. backtrace: [<000000000d15010d>] kmem_cache_alloc+0x178/0x208 [<00000000d7c1d264>] nfs4_set_lock_state+0x124/0x1f0 [<000000009c867628>] nfs4_proc_lock+0x90/0x478 [<000000001686bd74>] do_setlk+0x64/0xe8 [<00000000e01500d4>] nfs_lock+0xe8/0x1f0 [<000000004f387d8d>] vfs_lock_file+0x18/0x40 [<00000000656ab79b>] do_lock_file_wait+0x68/0xf8 [<00000000f17c4a4b>] fcntl_setlk+0x224/0x280 [<0000000052a242c6>] do_fcntl+0x418/0x730 [<000000004f47291a>] __arm64_sys_fcntl+0x84/0xd0 [<00000000d6856e01>] el0_svc_common+0x80/0xf0 [<000000009c4bd1df>] el0_svc_handler+0x2c/0x80 [<00000000b1a0d479>] el0_svc+0x8/0xc [<0000000056c62a0f>] 0xffffffffffffffff This patch removes the original refcount_inc(&lsp->ls_count) that was paired with the memcpy() lock copying. Fixes: 7b587e1a5a6c ("NFS: use locks_copy_lock() to copy locks.") Cc: # 5.0.x- Cc: NeilBrown Signed-off-by: Catalin Marinas --- fs/nfs/nfs4proc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 4dbb0ee23432..6d2812a39287 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -6301,7 +6301,6 @@ static struct nfs4_unlockdata *nfs4_alloc_unlockdata(struct file_lock *fl, p->arg.seqid = seqid; p->res.seqid = seqid; p->lsp = lsp; - refcount_inc(&lsp->ls_count); /* Ensure we don't close file until we're done freeing locks! */ p->ctx = get_nfs_open_context(ctx); p->l_ctx = nfs_get_lock_context(ctx); @@ -6526,7 +6525,6 @@ static struct nfs4_lockdata *nfs4_alloc_lockdata(struct file_lock *fl, p->res.lock_seqid = p->arg.lock_seqid; p->lsp = lsp; p->server = server; - refcount_inc(&lsp->ls_count); p->ctx = get_nfs_open_context(ctx); locks_init_lock(&p->fl); locks_copy_lock(&p->fl, fl);