OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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 c5b29f885a "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: Roberto Bergantinos Corpas <rbergant@redhat.com>
Cc: stable@vger.kernel.org
Fixes: 030d794bf4 "SUNRPC: Use gssproxy upcall for server..."
Tested-By: Frank Sorenson <sorenson@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Roberto Bergantinos Corpas 2020-02-04 11:32:56 +01:00 committed by J. Bruce Fields
parent 50d0def966
commit 3d96208c30
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/sunrpc/auth_gss/svcauth_gss.c
View File

@ -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,
&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;