Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2518821imu; Thu, 29 Nov 2018 06:19:16 -0800 (PST) X-Google-Smtp-Source: AFSGD/XyjTsD/wAg26ajkUbTL7RBhMXYQOGe1y+tJ3L92zmQjEdDIJAIYtPFvEU90gOPXqiZvJTk X-Received: by 2002:a63:4e41:: with SMTP id o1mr215256pgl.282.1543501156729; Thu, 29 Nov 2018 06:19:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543501156; cv=none; d=google.com; s=arc-20160816; b=wrWGwLkkReohwFOhUOlztYEFof7Fur3jFW/vjw2bepwRBZUG3MTU+AvQ8s4c9cqh7k c2uYMBdwAEseMxZNW6xofj86EjmxjgMUVDExjMoBKZvi9gaWWf3JFW+rFnxKJfKHtNQz 5uGttl1nQJolGEptWgiL6vm8LzO/gx7MNHy7Gmn6OnWGjUOG/R/0Uu+3aT6qnmIoB4Z+ K0CZAlJixeiVqHTedBOarIM182+WY+gm8d032lZGa3WFWMa8saZQuLbinbYXsa8qJDyD 2ZDqew+mV5AEsFKp3jn3Oo7g2JhWIhxiVfIN8/JymlZbNKsVoPy2+USgfoK7WZwrchlC MmFA== 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=+fXyKnG+n9RSVzMoUBMfDOiCchABc5oAyw4Curkqjk0=; b=QVbVUyUdVMWLmh9jk9E29iCwGI5TSoVx7PGX+p1Dd9N2w3SnDNAL3iMbjdNXhY7h6A T6gys7h1GwoDaeDds5mciA+JXLJDUuVm4f/o0op20GJGmTmrUXrwlGv60IeI20a9zRTg FJ9lomXFWUmE4bjxBQA8NJ7XRNUpb+k/8YjBzucjhI3//Zy8jkeFDn34Sy8V1i7YBsBr Tn5q4tpWqLNT8c/BskYTtPM8Q4Exss1BtMU6Q9zVh42Kr9/SCklXKggaiI4UcTSFft0x hZxwm25yWd7GElm2nyrs8LOOk6g58uugaSq+IBDFsUxKwQlNF9aue0atw1mcIpyviWjm UAig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HiLIG6dC; 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 37si1768270pgw.590.2018.11.29.06.19.01; Thu, 29 Nov 2018 06:19:16 -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=HiLIG6dC; 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 S1730404AbeK3BXA (ORCPT + 99 others); Thu, 29 Nov 2018 20:23:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:44882 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728439AbeK3BW7 (ORCPT ); Thu, 29 Nov 2018 20:22:59 -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 4EBBB205C9; Thu, 29 Nov 2018 14:17:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1543501048; bh=QN5eg2uCV4ycb/wRlyiYXm82VYfLajXUSlbegc3ccNg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HiLIG6dCkLBA83QBQfCt6Tu91ybZq6hXCRHMKr849XONLdKw9qdufgOYsz31fLb/7 gctU3ItvSsE6r4pgzSHbcl+Uhj2Aok4XKV6mxno+iEROLmm2BTq07pBAr4GxJulkkv 8ivLvz2xRP+x0JNJ9YxK+6lt+6sq4t66/5DlNpyU= 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.4 21/86] SUNRPC: Fix a bogus get/put in generic_key_to_expire() Date: Thu, 29 Nov 2018 15:11:46 +0100 Message-Id: <20181129140111.580717471@linuxfoundation.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181129140109.832117862@linuxfoundation.org> References: <20181129140109.832117862@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.4-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 41248b1820c7..cc27e38392ea 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