Commit 9e469e30 authored by Eric W. Biederman's avatar Eric W. Biederman

sunrpc: Hash uids by first computing their value in the initial userns

In svcauth_unix introduce a helper unix_gid_hash as otherwise the
expresion to generate the hash value is just too long.

Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent 683428fa
...@@ -412,7 +412,7 @@ rpcauth_lookup_credcache(struct rpc_auth *auth, struct auth_cred * acred, ...@@ -412,7 +412,7 @@ rpcauth_lookup_credcache(struct rpc_auth *auth, struct auth_cred * acred,
*entry, *new; *entry, *new;
unsigned int nr; unsigned int nr;
nr = hash_long(acred->uid, cache->hashbits); nr = hash_long(from_kuid(&init_user_ns, acred->uid), cache->hashbits);
rcu_read_lock(); rcu_read_lock();
hlist_for_each_entry_rcu(entry, pos, &cache->hashtable[nr], cr_hash) { hlist_for_each_entry_rcu(entry, pos, &cache->hashtable[nr], cr_hash) {
......
...@@ -419,6 +419,11 @@ struct unix_gid { ...@@ -419,6 +419,11 @@ struct unix_gid {
struct group_info *gi; struct group_info *gi;
}; };
static int unix_gid_hash(kuid_t uid)
{
return hash_long(from_kuid(&init_user_ns, uid), GID_HASHBITS);
}
static void unix_gid_put(struct kref *kref) static void unix_gid_put(struct kref *kref)
{ {
struct cache_head *item = container_of(kref, struct cache_head, ref); struct cache_head *item = container_of(kref, struct cache_head, ref);
...@@ -530,7 +535,7 @@ static int unix_gid_parse(struct cache_detail *cd, ...@@ -530,7 +535,7 @@ static int unix_gid_parse(struct cache_detail *cd,
ug.h.expiry_time = expiry; ug.h.expiry_time = expiry;
ch = sunrpc_cache_update(cd, ch = sunrpc_cache_update(cd,
&ug.h, &ugp->h, &ug.h, &ugp->h,
hash_long(uid, GID_HASHBITS)); unix_gid_hash(uid));
if (!ch) if (!ch)
err = -ENOMEM; err = -ENOMEM;
else { else {
...@@ -621,7 +626,7 @@ static struct unix_gid *unix_gid_lookup(struct cache_detail *cd, kuid_t uid) ...@@ -621,7 +626,7 @@ static struct unix_gid *unix_gid_lookup(struct cache_detail *cd, kuid_t uid)
struct cache_head *ch; struct cache_head *ch;
ug.uid = uid; ug.uid = uid;
ch = sunrpc_cache_lookup(cd, &ug.h, hash_long(uid, GID_HASHBITS)); ch = sunrpc_cache_lookup(cd, &ug.h, unix_gid_hash(uid));
if (ch) if (ch)
return container_of(ch, struct unix_gid, h); return container_of(ch, struct unix_gid, h);
else else
......
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