Commit 3d96208c authored by Roberto Bergantinos Corpas's avatar Roberto Bergantinos Corpas Committed by J. Bruce Fields

sunrpc: expiry_time should be seconds not timeval

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. Using
64 bit variants of getboottime/timespec

Expiration times have worked this way since 2010's c5b29f88 "sunrpc:
use seconds since boot in expiry cache".  The gssproxy code introduced
in 2012 added gss_proxy_save_rsc and introduced the bug.  That's a while
for this to lurk, but it required a bit of an extreme case to make it
obvious.
Signed-off-by: default avatarRoberto Bergantinos Corpas <rbergant@redhat.com>
Cc: stable@vger.kernel.org
Fixes: 030d794b "SUNRPC: Use gssproxy upcall for server..."
Tested-By: default avatarFrank Sorenson <sorenson@redhat.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 50d0def9
...@@ -1248,6 +1248,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd, ...@@ -1248,6 +1248,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd,
dprintk("RPC: No creds found!\n"); dprintk("RPC: No creds found!\n");
goto out; goto out;
} else { } else {
struct timespec64 boot;
/* steal creds */ /* steal creds */
rsci.cred = ud->creds; rsci.cred = ud->creds;
...@@ -1268,6 +1269,9 @@ static int gss_proxy_save_rsc(struct cache_detail *cd, ...@@ -1268,6 +1269,9 @@ static int gss_proxy_save_rsc(struct cache_detail *cd,
&expiry, GFP_KERNEL); &expiry, GFP_KERNEL);
if (status) if (status)
goto out; goto out;
getboottime64(&boot);
expiry -= boot.tv_sec;
} }
rsci.h.expiry_time = expiry; rsci.h.expiry_time = expiry;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment