From patchwork Fri Jan 24 10:11:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roberto Bergantinos Corpas X-Patchwork-Id: 11350051 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C723A92A for ; Fri, 24 Jan 2020 10:12:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A58F420708 for ; Fri, 24 Jan 2020 10:12:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ejlzaLX6" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389081AbgAXKMB (ORCPT ); Fri, 24 Jan 2020 05:12:01 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:29410 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2387509AbgAXKMA (ORCPT ); Fri, 24 Jan 2020 05:12:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579860720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=pMjOSZK58N7M6Rhz2Q0zLJbK9wOAIHwivc/jQo31Ecg=; b=ejlzaLX68r6XqyXu1e3sjK36xew6tEE7/kN4FUasqClhzhOjjRW1UxCAlfODLG+9qIh7hZ z/WKEplZWVq8K0XTQsHmrBnmdJAopeOG6m73olus4+bL4W1PpZ4olRck1nPVbgdpRw40vX AeRXrVU0wmGbbs/VrujK1Egtdw7c7ZE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-42-8SFVgEeCM9OIiyyyXZdlaQ-1; Fri, 24 Jan 2020 05:11:58 -0500 X-MC-Unique: 8SFVgEeCM9OIiyyyXZdlaQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7E13A18A8C86; Fri, 24 Jan 2020 10:11:57 +0000 (UTC) Received: from idlethread.redhat.com (ovpn-116-72.ams2.redhat.com [10.36.116.72]) by smtp.corp.redhat.com (Postfix) with ESMTP id C1F99A4B60; Fri, 24 Jan 2020 10:11:55 +0000 (UTC) From: Roberto Bergantinos Corpas To: bfields@fieldses.org Cc: chuck.lever@oracle.com, trond.myklebust@hammerspace.com, linux-nfs@vger.kernel.org Subject: [PATCH] sunrpc: expiry_time should be seconds not timeval Date: Fri, 24 Jan 2020 11:11:54 +0100 Message-Id: <20200124101154.22760-1-rbergant@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org When upcalling gssproxy, cache_head.expiry_time is set as a timeval, not seconds since boot. As such, RPC cache expiry logic will not clean expired objects created under auth.rpcsec.context cache. This has proven to cause kernel memory leaks on field. Signed-off-by: Roberto Bergantinos Corpas Tested-By: Frank Sorenson --- net/sunrpc/auth_gss/svcauth_gss.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c index 8be2f209982b..725cf5b5ae40 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c @@ -1211,6 +1211,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd, dprintk("RPC: No creds found!\n"); goto out; } else { + struct timespec boot; /* steal creds */ rsci.cred = ud->creds; @@ -1231,6 +1232,9 @@ static int gss_proxy_save_rsc(struct cache_detail *cd, &expiry, GFP_KERNEL); if (status) goto out; + + getboottime(&boot); + expiry -= boot.tv_sec; } rsci.h.expiry_time = expiry;