From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B156CA9EC9 for ; Mon, 4 Nov 2019 22:03:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4E63E222C4 for ; Mon, 4 Nov 2019 22:03:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572905035; bh=3COlhzhvPOBrpE/6ph6hpqEDpr+0arf86B8sdJA0n2A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=O8WKkHtcLuuPzeHEFOA6DC5IHNKjkKdkbDRJh4D7VSl5K1HiaBZEZAUtqEEHbhe6N CapcF9XD0VVPjoaDHfBvyH9DI9dkELG7XgeK9f+q3HO07KoV5oEDMvWj9hwGEkRsYv LssmzI7cB5OMUTvlLP1DeJ39jiUd5hATx6a7eYtQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389137AbfKDWDy (ORCPT ); Mon, 4 Nov 2019 17:03:54 -0500 Received: from mail.kernel.org ([198.145.29.99]:34334 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389133AbfKDWDu (ORCPT ); Mon, 4 Nov 2019 17:03:50 -0500 Received: from localhost (6.204-14-84.ripe.coltfrance.com [84.14.204.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 926AD222D4; Mon, 4 Nov 2019 22:03:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572905030; bh=3COlhzhvPOBrpE/6ph6hpqEDpr+0arf86B8sdJA0n2A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0jOetgHGrDPKLRsXKhWbekaP9EvjlOIC9l/19EEZ1EcqaUqVLZLiaG4fuK3YSDQGR syGTmQzhB0iAyzOiDa+WkUPkGyhsRG6/Vbfr0LhjqOqsqlghh5+Cl2WPiTvl85wahr 2X9oy+IE6SAKYbxpq2pyNjQG8hWdJibfLeCMqr9s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Trond Myklebust , Anna Schumaker Subject: [PATCH 4.19 134/149] NFS: Fix an RCU lock leak in nfs4_refresh_delegation_stateid() Date: Mon, 4 Nov 2019 22:45:27 +0100 Message-Id: <20191104212146.168377819@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191104212126.090054740@linuxfoundation.org> References: <20191104212126.090054740@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Trond Myklebust commit 79cc55422ce99be5964bde208ba8557174720893 upstream. A typo in nfs4_refresh_delegation_stateid() means we're leaking an RCU lock, and always returning a value of 'false'. As the function description states, we were always supposed to return 'true' if a matching delegation was found. Fixes: 12f275cdd163 ("NFSv4: Retry CLOSE and DELEGRETURN on NFS4ERR_OLD_STATEID.") Cc: stable@vger.kernel.org # v4.15+ Signed-off-by: Trond Myklebust Signed-off-by: Anna Schumaker Signed-off-by: Greg Kroah-Hartman --- fs/nfs/delegation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -1154,7 +1154,7 @@ bool nfs4_refresh_delegation_stateid(nfs if (delegation != NULL && nfs4_stateid_match_other(dst, &delegation->stateid)) { dst->seqid = delegation->stateid.seqid; - return ret; + ret = true; } rcu_read_unlock(); out: