Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2513251imu; Thu, 29 Nov 2018 06:15:05 -0800 (PST) X-Google-Smtp-Source: AFSGD/V4/NeKjYveurtrgMOGmMw3J3UCTkTscXimLxYeVxrxgMpw/NdXg3fVr596XCjQo2G8JGQx X-Received: by 2002:a63:2bc4:: with SMTP id r187mr190803pgr.306.1543500905898; Thu, 29 Nov 2018 06:15:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543500905; cv=none; d=google.com; s=arc-20160816; b=UE3TvmpOB/VTgWhubSzwSjRqGoCHWM5+pc8l4zTd63MMENVQ23mPbTmIf0gSevso2E RjGnYpsN1VsvSUSd2CgqxkR2PUn69hPbyp021JOf6AZAW4t1XVIQij+dVasgXiZelFSo EJ272L5/RotxBh/86KAG/m3Kkh8x5cZh5uyISkKUyeNUeukqdINewR2Q/iWEgBM3uuEi tVLw3x+eWo/yQUNYtLkzCmDsM1KkF/7n4qZhJmD28Hq8VYFndWRJ5yOvBn73OKkx6Xh9 VaGoKbCkuLmUMc3FrIFFExWcXSTAXgl2SrLx9bbdfJ6+JIddJWhoymW/3E/niV3Ov64C MVjw== 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=GcoeAHa8dFuRnDHo3mERzBNVuYDNK0ll7HGVnSI8/Eo=; b=QFmuNRBaey2h7s3+ypFUISu662Ug0Qy1ioouYYxUnlxr38sXx8BwLvqb2cAav7LH2t vKc+oplYlOH/d+rBwQjtBtyNvk51mtyy2u2wOeVDWlSdDXOeXTTf9C2nRiebb6efv53I uoYP9pqLdZb8v5BcOcRhEX2OTnYEe6zqlK6i/8cKznO1evV5KTfBv/M7whqXHXDbUGkF 1vphNqqDdApnEEFMgRsyUMc5klz+m4DrGkvAHer29mS76KHYXLbFhg5/W62H49A289yG wdZPIeLRV/sLK23whrx4j56dClrWIiXphPgEbc7DFUeS3LoNzrPzur4RhgQCab13dne2 +DEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gsijnGTr; 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 205si2167417pfa.199.2018.11.29.06.14.49; Thu, 29 Nov 2018 06:15:05 -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=gsijnGTr; 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 S1728642AbeK3BTS (ORCPT + 99 others); Thu, 29 Nov 2018 20:19:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:39774 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726989AbeK3BTS (ORCPT ); Thu, 29 Nov 2018 20:19:18 -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 8605E21019; Thu, 29 Nov 2018 14:13:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1543500828; bh=MRSdM2a8QPFspQTMV9aFD7qRCGAax/IjXIwvx6UtAKA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gsijnGTrUFTMpTa0r/D+XwbMeRyFDWtEhYKqTFfgD5LAhtD23oJl6Y9PRNfXyP9st by1gq5NGL79O47XMk+7vMq/6fm02t515PVm90kYQBO82peqmAPXavKftUizwMuIa1I UoZLmQZs7dqzKf4BLwDTTPPquPC+LUecnhOon0iA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Trond Myklebust , Sasha Levin Subject: [PATCH 3.18 15/83] SUNRPC: Fix a bogus get/put in generic_key_to_expire() Date: Thu, 29 Nov 2018 15:11:33 +0100 Message-Id: <20181129140138.951921938@linuxfoundation.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181129140138.002176596@linuxfoundation.org> References: <20181129140138.002176596@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 3.18-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 6f6b829c9e8e..42e93bf496e7 100644 --- a/net/sunrpc/auth_generic.c +++ b/net/sunrpc/auth_generic.c @@ -272,13 +272,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