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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 0FD84C2D0DB for ; Fri, 24 Jan 2020 11:20:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D16082075D for ; Fri, 24 Jan 2020 11:20:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579864839; bh=Bahj00EtHP8l6OKebt7WF0LuUHVdytY1H+LqkI8HKj4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cS3bELn2ZmQWrp1vcZKX4PrbrXVpvPeFrQIKYLmcPYBWF0lsl1hGbEnlx/i2amzWI H29ktSi/LNfUwFEgKt8aj2X1tl1mAH3st07/FXOo+yYwc4g9dW0U76pla0HRzUch3q 67B9A5CsM3bnTRNTKJIY/OwgRF7tdQGwl3tiJO0Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390943AbgAXLUi (ORCPT ); Fri, 24 Jan 2020 06:20:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:58322 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390727AbgAXLUd (ORCPT ); Fri, 24 Jan 2020 06:20:33 -0500 Received: from localhost (ip-213-127-102-57.ip.prioritytelecom.net [213.127.102.57]) (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 6154A2075D; Fri, 24 Jan 2020 11:20:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579864833; bh=Bahj00EtHP8l6OKebt7WF0LuUHVdytY1H+LqkI8HKj4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=euqW1X51Rkg4n4NRs3lxgyej/+B0yoxypigjBH1tAudnO3OeOmswqEqJKvOnuA36X dMJLFZGTnx09a2/0g5/UKG5A13yjvnXFeYb6tPIsXH8a4C+Gq+QimHGFbW5B4ZlBGL LGgQX6EQzv/4CbFISP4zwo4ft2VFZrK5BwEKeT8c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, David Howells , Sasha Levin Subject: [PATCH 4.19 378/639] afs: Fix double inc of vnode->cb_break Date: Fri, 24 Jan 2020 10:29:08 +0100 Message-Id: <20200124093134.349568391@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124093047.008739095@linuxfoundation.org> References: <20200124093047.008739095@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: David Howells [ Upstream commit fd711586bb7d63f257da5eff234e68c446ac35ea ] When __afs_break_callback() clears the CB_PROMISED flag, it increments vnode->cb_break to trigger a future refetch of the status and callback - however it also calls afs_clear_permits(), which also increments vnode->cb_break. Fix this by removing the increment from afs_clear_permits(). Whilst we're at it, fix the conditional call to afs_put_permits() as the function checks to see if the argument is NULL, so the check is redundant. Fixes: be080a6f43c4 ("afs: Overhaul permit caching"); Signed-off-by: David Howells Signed-off-by: Sasha Levin --- fs/afs/security.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/afs/security.c b/fs/afs/security.c index 81dfedb7879ff..66042b432baa8 100644 --- a/fs/afs/security.c +++ b/fs/afs/security.c @@ -87,11 +87,9 @@ void afs_clear_permits(struct afs_vnode *vnode) permits = rcu_dereference_protected(vnode->permit_cache, lockdep_is_held(&vnode->lock)); RCU_INIT_POINTER(vnode->permit_cache, NULL); - vnode->cb_break++; spin_unlock(&vnode->lock); - if (permits) - afs_put_permits(permits); + afs_put_permits(permits); } /* -- 2.20.1