Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2561572imu; Thu, 29 Nov 2018 06:56:45 -0800 (PST) X-Google-Smtp-Source: AFSGD/XHzi442ALeCU5vfMdUhI5SqwUQAXJ2mJuYB6cbt1pYI7AMO2dSZYnACPMDCvrvnckE8fO9 X-Received: by 2002:a63:d547:: with SMTP id v7mr306947pgi.339.1543503405702; Thu, 29 Nov 2018 06:56:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543503405; cv=none; d=google.com; s=arc-20160816; b=BVDEqWfks8EVpeMFDR8yr/F867A+LycJzciIBro/aZHmveUhWaabQdfoVthcB1oOMA F9oeDfAudcyCRxtn9YGuDk86HwV1NcsuBQfRvXaGMHs8fhPRDCDlab8t+f5DlpZ1wtGW T8hsL+v1U4iwQSt0o0GmJpHU+aspBz1o4f9yFCY5GS8AmpfMeiG1B/CRA3vwh9KY/QKT SqJfx3jIbt5G2/nX1JiGOuv3mwYVrB8GJr5L0r8wqQZXGpCWra03SXYHtleSmQdWlDVO JSBGT5ZbTOMIoA7i4AcWikinKeLugPaxk0nTbVl/uzk/HG5hmbTu1OH/f0+9wiRK6pa6 0zlw== 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=7FqAAMnjbsebf91+bOW1wjD0L6zSZieXbbAm9WY7SJ0=; b=QzWcS1iG5mO6LCuCL4Of/p1wQDPixgv6224f+dN3Oh9Imdrsf4YhO62Xe/wqJkqUhv nTMXs1DQR3Jl9o73o8BdifsA+oJ+b1i/CvWpHEKiPT/peTJ16IW02HsR10c/UKWnmfVE yc6N6DK5YsuiuGkIyqlziz7lyFS0juDrgkDPht0JegAC/kHU/A7nVnqSbohK8dVWfwQt 4m4GYu9TMwYptSffXT3/wF0VwdHqnv6BCoBQGwpayLqYdGIEBXJRsiDlA9yUpGGRStEH AbSciO9lyEp6+D5B4iS1y/A3lzWUDtwFrg9nXPkUcGDc0mSKriBujRra/MPHqEQaK7dr YgjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=OjaXRgdS; 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 v190si2386571pfv.8.2018.11.29.06.56.31; Thu, 29 Nov 2018 06:56:45 -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=OjaXRgdS; 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 S1731757AbeK3B1Q (ORCPT + 99 others); Thu, 29 Nov 2018 20:27:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:52016 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729984AbeK3B1P (ORCPT ); Thu, 29 Nov 2018 20:27:15 -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 25C642133F; Thu, 29 Nov 2018 14:21:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1543501304; bh=tVllfzewr4TZp8ckDysYrscPpJW53rwfDhyPFFKsQ+c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OjaXRgdSB2zqrJRaen7wDlRuOJDTG3kWRcIK5CZCQM2e/GsJRPzOCBMkXYZ+TPjp0 OkX2Tmp+BeRy//R7ZYousUWRrDRJdh0+PvFFwlzfckwc9zWrQcZo2AaeMxS0HbCiJC 7lWMWOKK8bJsSPR4CbvOS/BIfsbQ9n20KXqVqJcc= 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.9 36/92] SUNRPC: Fix a bogus get/put in generic_key_to_expire() Date: Thu, 29 Nov 2018 15:12:05 +0100 Message-Id: <20181129140109.248276506@linuxfoundation.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181129140106.520639693@linuxfoundation.org> References: <20181129140106.520639693@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.9-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