Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2530118imu; Thu, 29 Nov 2018 06:28:30 -0800 (PST) X-Google-Smtp-Source: AFSGD/UoQcfFJPi18MEAXLLG4ZYRTuAC0UUWvCoQQsYRybsaypKI5RZENOestLp8ouWM47DM+NcO X-Received: by 2002:a17:902:d891:: with SMTP id b17mr1742773plz.80.1543501710246; Thu, 29 Nov 2018 06:28:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543501710; cv=none; d=google.com; s=arc-20160816; b=fVH/yvlFe84QB6TrN3fdmRtkAZI3xOFaLXwYojX9tH5J5GzNHnjloddmxbp8i7zzMp 71q/udbOG35i+c5cG/ETgH86dLCiDetwoX8lyaIVWSqjfqO7EROd1kAYdSKMeGhLMuQJ JhyZI0cyhTlH+gIphbOp+MCn/N9WL807UBXslx0lqJpOT/5hHXt7QythoC1iT4QKYyds s5pRQET8rgzVDNq6PLu3gOTL8kKPQGwmJdUDetdiTgU7/E1M2ccGXWxGhO4uWukT9f2X uBv6nR0LrJ+/fBJajfXI0n8w8/RN+UzKT98tj3cn4peGO1Gjve0poNcrcUkEVNMouCyn OHWg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=dpaa5Lw0IQobecK9BIuny7rqvF9LqA/+gEZ92tLAK8w=; b=qw3olTXOvFsLzh4OrZmPiv7k9wdJ9zexAm4yxc74vMUDbFeFkCWd8NWgtYhzxDmSZu 7WCQqeatqBR+HgLzF7VNd55wLYDgyVvavwXUSt6VmSd78EjecBirntT5Oe1MoOzw3RG7 g8p2/FbzydnAmI59pxJE1OnjtQKD/iYV0SSM7erAMqU0FmQhQjFB9fcvXZiDCyFqtMUq ZUersixn3DG6tShO/bHAm7QsGDY8IZVi8D79vd9FMbpEetW3dsisSZXDU65lvrrQWvul LaLCn5jTVBYhpIGTBU5eez5CdHWjtIeKhAtxt/4Fgajr5lZjS7rZ8WZLOdaa1WBazH3v I3Wg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=p+JXk94z; 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 11si2090329pgs.126.2018.11.29.06.28.14; Thu, 29 Nov 2018 06:28:30 -0800 (PST) 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; dkim=pass header.i=@kernel.org header.s=default header.b=p+JXk94z; 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 S1733283AbeK3Bb5 (ORCPT + 99 others); Thu, 29 Nov 2018 20:31:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:59758 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729984AbeK3Bb4 (ORCPT ); Thu, 29 Nov 2018 20:31:56 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (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 1BD9F213A2; Thu, 29 Nov 2018 14:26:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1543501584; bh=RsWNS1PIoBM3zYgVHLUzTtXcn+kDVjIHzll+5dhAqVM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p+JXk94zJc0owrxv1y3n7AP7Bv3VcG+vpbGK2DEmoCgS8IRhJXqHkIVoO1jM1cEog 1aByZtKTbwPGK5DX3V76um7zPyO9+VjMK1ufRSM5RJZrEjPnZWlYMIQQIqYbyKEWWL MeY6enq3+xSGlP5W7MMu+EZeUwU1NGecDhqikKNI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Trond Myklebust , Sasha Levin Subject: [PATCH 4.14 058/100] SUNRPC: Fix a bogus get/put in generic_key_to_expire() Date: Thu, 29 Nov 2018 15:12:28 +0100 Message-Id: <20181129140104.107686763@linuxfoundation.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181129140058.768942700@linuxfoundation.org> References: <20181129140058.768942700@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review 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 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit e3d5e573a54dabdc0f9f3cb039d799323372b251 ] Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- net/sunrpc/auth_generic.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/net/sunrpc/auth_generic.c b/net/sunrpc/auth_generic.c index f1df9837f1ac..1ac08dcbf85d 100644 --- a/net/sunrpc/auth_generic.c +++ b/net/sunrpc/auth_generic.c @@ -281,13 +281,7 @@ static bool generic_key_to_expire(struct rpc_cred *cred) { struct auth_cred *acred = &container_of(cred, struct generic_cred, gc_base)->acred; - bool ret; - - get_rpccred(cred); - ret = test_bit(RPC_CRED_KEY_EXPIRE_SOON, &acred->ac_flags); - put_rpccred(cred); - - return ret; + return test_bit(RPC_CRED_KEY_EXPIRE_SOON, &acred->ac_flags); } static const struct rpc_credops generic_credops = { -- 2.17.1