2005-04-17 02:20:36 +04:00
|
|
|
/*
|
|
|
|
* Mapping of UID/GIDs to name and vice versa.
|
|
|
|
*
|
|
|
|
* Copyright (c) 2002, 2003 The Regents of the University of
|
|
|
|
* Michigan. All rights reserved.
|
|
|
|
*
|
|
|
|
* Marius Aamodt Eriksen <marius@umich.edu>
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
*
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
* 3. Neither the name of the University nor the names of its
|
|
|
|
* contributors may be used to endorse or promote products derived
|
|
|
|
* from this software without specific prior written permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
|
|
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
|
|
* DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
|
|
|
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
|
|
|
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
|
|
|
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
|
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/seq_file.h>
|
2009-12-03 21:29:12 +03:00
|
|
|
#include <linux/sched.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 11:04:11 +03:00
|
|
|
#include <linux/slab.h>
|
2011-01-05 01:37:15 +03:00
|
|
|
#include "idmap.h"
|
2011-01-05 01:53:52 +03:00
|
|
|
#include "nfsd.h"
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Cache entry
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* XXX we know that IDMAP_NAMESZ < PAGE_SIZE, but it's ugly to rely on
|
|
|
|
* that.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define IDMAP_TYPE_USER 0
|
|
|
|
#define IDMAP_TYPE_GROUP 1
|
|
|
|
|
|
|
|
struct ent {
|
|
|
|
struct cache_head h;
|
|
|
|
int type; /* User / Group */
|
|
|
|
uid_t id;
|
|
|
|
char name[IDMAP_NAMESZ];
|
|
|
|
char authname[IDMAP_NAMESZ];
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Common entry handling */
|
|
|
|
|
|
|
|
#define ENT_HASHBITS 8
|
|
|
|
#define ENT_HASHMAX (1 << ENT_HASHBITS)
|
|
|
|
#define ENT_HASHMASK (ENT_HASHMAX - 1)
|
|
|
|
|
2006-03-27 13:15:06 +04:00
|
|
|
static void
|
|
|
|
ent_init(struct cache_head *cnew, struct cache_head *citm)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2006-03-27 13:15:06 +04:00
|
|
|
struct ent *new = container_of(cnew, struct ent, h);
|
|
|
|
struct ent *itm = container_of(citm, struct ent, h);
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
new->id = itm->id;
|
|
|
|
new->type = itm->type;
|
|
|
|
|
|
|
|
strlcpy(new->name, itm->name, sizeof(new->name));
|
|
|
|
strlcpy(new->authname, itm->authname, sizeof(new->name));
|
|
|
|
}
|
|
|
|
|
2005-06-24 09:04:03 +04:00
|
|
|
static void
|
2006-03-27 13:15:09 +04:00
|
|
|
ent_put(struct kref *ref)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2006-03-27 13:15:09 +04:00
|
|
|
struct ent *map = container_of(ref, struct ent, h.ref);
|
|
|
|
kfree(map);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2006-03-27 13:15:06 +04:00
|
|
|
static struct cache_head *
|
|
|
|
ent_alloc(void)
|
|
|
|
{
|
|
|
|
struct ent *e = kmalloc(sizeof(*e), GFP_KERNEL);
|
|
|
|
if (e)
|
|
|
|
return &e->h;
|
|
|
|
else
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/*
|
|
|
|
* ID -> Name cache
|
|
|
|
*/
|
|
|
|
|
|
|
|
static struct cache_head *idtoname_table[ENT_HASHMAX];
|
|
|
|
|
|
|
|
static uint32_t
|
|
|
|
idtoname_hash(struct ent *ent)
|
|
|
|
{
|
|
|
|
uint32_t hash;
|
|
|
|
|
|
|
|
hash = hash_str(ent->authname, ENT_HASHBITS);
|
|
|
|
hash = hash_long(hash ^ ent->id, ENT_HASHBITS);
|
|
|
|
|
|
|
|
/* Flip LSB for user/group */
|
|
|
|
if (ent->type == IDMAP_TYPE_GROUP)
|
|
|
|
hash ^= 1;
|
|
|
|
|
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
idtoname_request(struct cache_detail *cd, struct cache_head *ch, char **bpp,
|
|
|
|
int *blen)
|
|
|
|
{
|
|
|
|
struct ent *ent = container_of(ch, struct ent, h);
|
|
|
|
char idstr[11];
|
|
|
|
|
|
|
|
qword_add(bpp, blen, ent->authname);
|
2007-07-31 11:37:52 +04:00
|
|
|
snprintf(idstr, sizeof(idstr), "%u", ent->id);
|
2005-04-17 02:20:36 +04:00
|
|
|
qword_add(bpp, blen, ent->type == IDMAP_TYPE_GROUP ? "group" : "user");
|
|
|
|
qword_add(bpp, blen, idstr);
|
|
|
|
|
|
|
|
(*bpp)[-1] = '\n';
|
|
|
|
}
|
|
|
|
|
2009-08-09 23:14:29 +04:00
|
|
|
static int
|
|
|
|
idtoname_upcall(struct cache_detail *cd, struct cache_head *ch)
|
|
|
|
{
|
|
|
|
return sunrpc_cache_pipe_upcall(cd, ch, idtoname_request);
|
|
|
|
}
|
|
|
|
|
2006-03-27 13:15:06 +04:00
|
|
|
static int
|
|
|
|
idtoname_match(struct cache_head *ca, struct cache_head *cb)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2006-03-27 13:15:06 +04:00
|
|
|
struct ent *a = container_of(ca, struct ent, h);
|
|
|
|
struct ent *b = container_of(cb, struct ent, h);
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
return (a->id == b->id && a->type == b->type &&
|
|
|
|
strcmp(a->authname, b->authname) == 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
idtoname_show(struct seq_file *m, struct cache_detail *cd, struct cache_head *h)
|
|
|
|
{
|
|
|
|
struct ent *ent;
|
|
|
|
|
|
|
|
if (h == NULL) {
|
|
|
|
seq_puts(m, "#domain type id [name]\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
ent = container_of(h, struct ent, h);
|
2007-07-31 11:37:52 +04:00
|
|
|
seq_printf(m, "%s %s %u", ent->authname,
|
2005-04-17 02:20:36 +04:00
|
|
|
ent->type == IDMAP_TYPE_GROUP ? "group" : "user",
|
|
|
|
ent->id);
|
|
|
|
if (test_bit(CACHE_VALID, &h->flags))
|
|
|
|
seq_printf(m, " %s", ent->name);
|
|
|
|
seq_printf(m, "\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2009-08-09 23:14:26 +04:00
|
|
|
warn_no_idmapd(struct cache_detail *detail, int has_died)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
printk("nfsd: nfsv4 idmapping failing: has idmapd %s?\n",
|
2009-08-09 23:14:26 +04:00
|
|
|
has_died ? "died" : "not been started");
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int idtoname_parse(struct cache_detail *, char *, int);
|
2006-03-27 13:15:06 +04:00
|
|
|
static struct ent *idtoname_lookup(struct ent *);
|
|
|
|
static struct ent *idtoname_update(struct ent *, struct ent *);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2005-06-24 09:04:03 +04:00
|
|
|
static struct cache_detail idtoname_cache = {
|
2005-09-07 02:17:08 +04:00
|
|
|
.owner = THIS_MODULE,
|
2005-04-17 02:20:36 +04:00
|
|
|
.hash_size = ENT_HASHMAX,
|
|
|
|
.hash_table = idtoname_table,
|
|
|
|
.name = "nfs4.idtoname",
|
|
|
|
.cache_put = ent_put,
|
2009-08-09 23:14:29 +04:00
|
|
|
.cache_upcall = idtoname_upcall,
|
2005-04-17 02:20:36 +04:00
|
|
|
.cache_parse = idtoname_parse,
|
|
|
|
.cache_show = idtoname_show,
|
|
|
|
.warn_no_listener = warn_no_idmapd,
|
2006-03-27 13:15:06 +04:00
|
|
|
.match = idtoname_match,
|
|
|
|
.init = ent_init,
|
|
|
|
.update = ent_init,
|
|
|
|
.alloc = ent_alloc,
|
2005-04-17 02:20:36 +04:00
|
|
|
};
|
|
|
|
|
2008-02-20 23:49:00 +03:00
|
|
|
static int
|
2005-04-17 02:20:36 +04:00
|
|
|
idtoname_parse(struct cache_detail *cd, char *buf, int buflen)
|
|
|
|
{
|
|
|
|
struct ent ent, *res;
|
|
|
|
char *buf1, *bp;
|
2007-07-28 00:36:45 +04:00
|
|
|
int len;
|
2005-04-17 02:20:36 +04:00
|
|
|
int error = -EINVAL;
|
|
|
|
|
|
|
|
if (buf[buflen - 1] != '\n')
|
|
|
|
return (-EINVAL);
|
|
|
|
buf[buflen - 1]= '\0';
|
|
|
|
|
|
|
|
buf1 = kmalloc(PAGE_SIZE, GFP_KERNEL);
|
|
|
|
if (buf1 == NULL)
|
|
|
|
return (-ENOMEM);
|
|
|
|
|
|
|
|
memset(&ent, 0, sizeof(ent));
|
|
|
|
|
|
|
|
/* Authentication name */
|
|
|
|
if (qword_get(&buf, buf1, PAGE_SIZE) <= 0)
|
|
|
|
goto out;
|
|
|
|
memcpy(ent.authname, buf1, sizeof(ent.authname));
|
|
|
|
|
|
|
|
/* Type */
|
|
|
|
if (qword_get(&buf, buf1, PAGE_SIZE) <= 0)
|
|
|
|
goto out;
|
|
|
|
ent.type = strcmp(buf1, "user") == 0 ?
|
|
|
|
IDMAP_TYPE_USER : IDMAP_TYPE_GROUP;
|
|
|
|
|
|
|
|
/* ID */
|
|
|
|
if (qword_get(&buf, buf1, PAGE_SIZE) <= 0)
|
|
|
|
goto out;
|
|
|
|
ent.id = simple_strtoul(buf1, &bp, 10);
|
|
|
|
if (bp == buf1)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
/* expiry */
|
|
|
|
ent.h.expiry_time = get_expiry(&buf);
|
|
|
|
if (ent.h.expiry_time == 0)
|
|
|
|
goto out;
|
|
|
|
|
2006-03-27 13:15:06 +04:00
|
|
|
error = -ENOMEM;
|
|
|
|
res = idtoname_lookup(&ent);
|
|
|
|
if (!res)
|
|
|
|
goto out;
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/* Name */
|
2007-07-28 00:36:45 +04:00
|
|
|
error = -EINVAL;
|
|
|
|
len = qword_get(&buf, buf1, PAGE_SIZE);
|
|
|
|
if (len < 0)
|
2005-04-17 02:20:36 +04:00
|
|
|
goto out;
|
2007-07-28 00:36:45 +04:00
|
|
|
if (len == 0)
|
2005-04-17 02:20:36 +04:00
|
|
|
set_bit(CACHE_NEGATIVE, &ent.h.flags);
|
2007-10-26 21:32:50 +04:00
|
|
|
else if (len >= IDMAP_NAMESZ)
|
|
|
|
goto out;
|
|
|
|
else
|
2005-04-17 02:20:36 +04:00
|
|
|
memcpy(ent.name, buf1, sizeof(ent.name));
|
|
|
|
error = -ENOMEM;
|
2006-03-27 13:15:06 +04:00
|
|
|
res = idtoname_update(&ent, res);
|
|
|
|
if (res == NULL)
|
2005-04-17 02:20:36 +04:00
|
|
|
goto out;
|
|
|
|
|
2006-03-27 13:15:09 +04:00
|
|
|
cache_put(&res->h, &idtoname_cache);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
error = 0;
|
|
|
|
out:
|
|
|
|
kfree(buf1);
|
|
|
|
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2006-03-27 13:15:06 +04:00
|
|
|
|
|
|
|
static struct ent *
|
|
|
|
idtoname_lookup(struct ent *item)
|
|
|
|
{
|
|
|
|
struct cache_head *ch = sunrpc_cache_lookup(&idtoname_cache,
|
|
|
|
&item->h,
|
|
|
|
idtoname_hash(item));
|
|
|
|
if (ch)
|
|
|
|
return container_of(ch, struct ent, h);
|
|
|
|
else
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct ent *
|
|
|
|
idtoname_update(struct ent *new, struct ent *old)
|
|
|
|
{
|
|
|
|
struct cache_head *ch = sunrpc_cache_update(&idtoname_cache,
|
|
|
|
&new->h, &old->h,
|
|
|
|
idtoname_hash(new));
|
|
|
|
if (ch)
|
|
|
|
return container_of(ch, struct ent, h);
|
|
|
|
else
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Name -> ID cache
|
|
|
|
*/
|
|
|
|
|
|
|
|
static struct cache_head *nametoid_table[ENT_HASHMAX];
|
|
|
|
|
|
|
|
static inline int
|
|
|
|
nametoid_hash(struct ent *ent)
|
|
|
|
{
|
|
|
|
return hash_str(ent->name, ENT_HASHBITS);
|
|
|
|
}
|
|
|
|
|
2005-06-24 09:04:03 +04:00
|
|
|
static void
|
2005-04-17 02:20:36 +04:00
|
|
|
nametoid_request(struct cache_detail *cd, struct cache_head *ch, char **bpp,
|
|
|
|
int *blen)
|
|
|
|
{
|
|
|
|
struct ent *ent = container_of(ch, struct ent, h);
|
|
|
|
|
|
|
|
qword_add(bpp, blen, ent->authname);
|
|
|
|
qword_add(bpp, blen, ent->type == IDMAP_TYPE_GROUP ? "group" : "user");
|
|
|
|
qword_add(bpp, blen, ent->name);
|
|
|
|
|
|
|
|
(*bpp)[-1] = '\n';
|
|
|
|
}
|
|
|
|
|
2009-08-09 23:14:29 +04:00
|
|
|
static int
|
|
|
|
nametoid_upcall(struct cache_detail *cd, struct cache_head *ch)
|
|
|
|
{
|
|
|
|
return sunrpc_cache_pipe_upcall(cd, ch, nametoid_request);
|
|
|
|
}
|
|
|
|
|
2006-03-27 13:15:06 +04:00
|
|
|
static int
|
|
|
|
nametoid_match(struct cache_head *ca, struct cache_head *cb)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2006-03-27 13:15:06 +04:00
|
|
|
struct ent *a = container_of(ca, struct ent, h);
|
|
|
|
struct ent *b = container_of(cb, struct ent, h);
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
return (a->type == b->type && strcmp(a->name, b->name) == 0 &&
|
|
|
|
strcmp(a->authname, b->authname) == 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
nametoid_show(struct seq_file *m, struct cache_detail *cd, struct cache_head *h)
|
|
|
|
{
|
|
|
|
struct ent *ent;
|
|
|
|
|
|
|
|
if (h == NULL) {
|
|
|
|
seq_puts(m, "#domain type name [id]\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
ent = container_of(h, struct ent, h);
|
|
|
|
seq_printf(m, "%s %s %s", ent->authname,
|
|
|
|
ent->type == IDMAP_TYPE_GROUP ? "group" : "user",
|
|
|
|
ent->name);
|
|
|
|
if (test_bit(CACHE_VALID, &h->flags))
|
2007-07-31 11:37:52 +04:00
|
|
|
seq_printf(m, " %u", ent->id);
|
2005-04-17 02:20:36 +04:00
|
|
|
seq_printf(m, "\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-03-27 13:15:06 +04:00
|
|
|
static struct ent *nametoid_lookup(struct ent *);
|
|
|
|
static struct ent *nametoid_update(struct ent *, struct ent *);
|
2005-06-24 09:04:03 +04:00
|
|
|
static int nametoid_parse(struct cache_detail *, char *, int);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2005-06-24 09:04:03 +04:00
|
|
|
static struct cache_detail nametoid_cache = {
|
2005-09-07 02:17:08 +04:00
|
|
|
.owner = THIS_MODULE,
|
2005-04-17 02:20:36 +04:00
|
|
|
.hash_size = ENT_HASHMAX,
|
|
|
|
.hash_table = nametoid_table,
|
|
|
|
.name = "nfs4.nametoid",
|
|
|
|
.cache_put = ent_put,
|
2009-08-09 23:14:29 +04:00
|
|
|
.cache_upcall = nametoid_upcall,
|
2005-04-17 02:20:36 +04:00
|
|
|
.cache_parse = nametoid_parse,
|
|
|
|
.cache_show = nametoid_show,
|
|
|
|
.warn_no_listener = warn_no_idmapd,
|
2006-03-27 13:15:06 +04:00
|
|
|
.match = nametoid_match,
|
|
|
|
.init = ent_init,
|
|
|
|
.update = ent_init,
|
|
|
|
.alloc = ent_alloc,
|
2005-04-17 02:20:36 +04:00
|
|
|
};
|
|
|
|
|
2005-06-24 09:04:03 +04:00
|
|
|
static int
|
2005-04-17 02:20:36 +04:00
|
|
|
nametoid_parse(struct cache_detail *cd, char *buf, int buflen)
|
|
|
|
{
|
|
|
|
struct ent ent, *res;
|
|
|
|
char *buf1;
|
|
|
|
int error = -EINVAL;
|
|
|
|
|
|
|
|
if (buf[buflen - 1] != '\n')
|
|
|
|
return (-EINVAL);
|
|
|
|
buf[buflen - 1]= '\0';
|
|
|
|
|
|
|
|
buf1 = kmalloc(PAGE_SIZE, GFP_KERNEL);
|
|
|
|
if (buf1 == NULL)
|
|
|
|
return (-ENOMEM);
|
|
|
|
|
|
|
|
memset(&ent, 0, sizeof(ent));
|
|
|
|
|
|
|
|
/* Authentication name */
|
|
|
|
if (qword_get(&buf, buf1, PAGE_SIZE) <= 0)
|
|
|
|
goto out;
|
|
|
|
memcpy(ent.authname, buf1, sizeof(ent.authname));
|
|
|
|
|
|
|
|
/* Type */
|
|
|
|
if (qword_get(&buf, buf1, PAGE_SIZE) <= 0)
|
|
|
|
goto out;
|
|
|
|
ent.type = strcmp(buf1, "user") == 0 ?
|
|
|
|
IDMAP_TYPE_USER : IDMAP_TYPE_GROUP;
|
|
|
|
|
|
|
|
/* Name */
|
|
|
|
error = qword_get(&buf, buf1, PAGE_SIZE);
|
|
|
|
if (error <= 0 || error >= IDMAP_NAMESZ)
|
|
|
|
goto out;
|
|
|
|
memcpy(ent.name, buf1, sizeof(ent.name));
|
|
|
|
|
|
|
|
/* expiry */
|
|
|
|
ent.h.expiry_time = get_expiry(&buf);
|
|
|
|
if (ent.h.expiry_time == 0)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
/* ID */
|
|
|
|
error = get_int(&buf, &ent.id);
|
|
|
|
if (error == -EINVAL)
|
|
|
|
goto out;
|
|
|
|
if (error == -ENOENT)
|
|
|
|
set_bit(CACHE_NEGATIVE, &ent.h.flags);
|
|
|
|
|
|
|
|
error = -ENOMEM;
|
2006-03-27 13:15:06 +04:00
|
|
|
res = nametoid_lookup(&ent);
|
|
|
|
if (res == NULL)
|
|
|
|
goto out;
|
|
|
|
res = nametoid_update(&ent, res);
|
|
|
|
if (res == NULL)
|
2005-04-17 02:20:36 +04:00
|
|
|
goto out;
|
|
|
|
|
2006-03-27 13:15:09 +04:00
|
|
|
cache_put(&res->h, &nametoid_cache);
|
2005-04-17 02:20:36 +04:00
|
|
|
error = 0;
|
|
|
|
out:
|
|
|
|
kfree(buf1);
|
|
|
|
|
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
|
2006-03-27 13:15:06 +04:00
|
|
|
|
|
|
|
static struct ent *
|
|
|
|
nametoid_lookup(struct ent *item)
|
|
|
|
{
|
|
|
|
struct cache_head *ch = sunrpc_cache_lookup(&nametoid_cache,
|
|
|
|
&item->h,
|
|
|
|
nametoid_hash(item));
|
|
|
|
if (ch)
|
|
|
|
return container_of(ch, struct ent, h);
|
|
|
|
else
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct ent *
|
|
|
|
nametoid_update(struct ent *new, struct ent *old)
|
|
|
|
{
|
|
|
|
struct cache_head *ch = sunrpc_cache_update(&nametoid_cache,
|
|
|
|
&new->h, &old->h,
|
|
|
|
nametoid_hash(new));
|
|
|
|
if (ch)
|
|
|
|
return container_of(ch, struct ent, h);
|
|
|
|
else
|
|
|
|
return NULL;
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Exported API
|
|
|
|
*/
|
|
|
|
|
2007-11-09 01:20:34 +03:00
|
|
|
int
|
2005-04-17 02:20:36 +04:00
|
|
|
nfsd_idmap_init(void)
|
|
|
|
{
|
2007-11-09 01:20:34 +03:00
|
|
|
int rv;
|
|
|
|
|
|
|
|
rv = cache_register(&idtoname_cache);
|
|
|
|
if (rv)
|
|
|
|
return rv;
|
|
|
|
rv = cache_register(&nametoid_cache);
|
|
|
|
if (rv)
|
|
|
|
cache_unregister(&idtoname_cache);
|
|
|
|
return rv;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
nfsd_idmap_shutdown(void)
|
|
|
|
{
|
2007-11-09 00:09:59 +03:00
|
|
|
cache_unregister(&idtoname_cache);
|
|
|
|
cache_unregister(&nametoid_cache);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
idmap_lookup(struct svc_rqst *rqstp,
|
2006-03-27 13:15:06 +04:00
|
|
|
struct ent *(*lookup_fn)(struct ent *), struct ent *key,
|
2005-04-17 02:20:36 +04:00
|
|
|
struct cache_detail *detail, struct ent **item)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
2010-08-12 11:04:06 +04:00
|
|
|
*item = lookup_fn(key);
|
|
|
|
if (!*item)
|
2005-04-17 02:20:36 +04:00
|
|
|
return -ENOMEM;
|
2010-08-12 11:04:06 +04:00
|
|
|
retry:
|
|
|
|
ret = cache_check(detail, &(*item)->h, &rqstp->rq_chandle);
|
|
|
|
|
|
|
|
if (ret == -ETIMEDOUT) {
|
|
|
|
struct ent *prev_item = *item;
|
|
|
|
*item = lookup_fn(key);
|
|
|
|
if (*item != prev_item)
|
|
|
|
goto retry;
|
|
|
|
cache_put(&(*item)->h, detail);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
knfsd: nfsd: set rq_client to ip-address-determined-domain
We want it to be possible for users to restrict exports both by IP address and
by pseudoflavor. The pseudoflavor information has previously been passed
using special auth_domains stored in the rq_client field. After the preceding
patch that stored the pseudoflavor in rq_pflavor, that's now superfluous; so
now we use rq_client for the ip information, as auth_null and auth_unix do.
However, we keep around the special auth_domain in the rq_gssclient field for
backwards compatibility purposes, so we can still do upcalls using the old
"gss/pseudoflavor" auth_domain if upcalls using the unix domain to give us an
appropriate export. This allows us to continue supporting old mountd.
In fact, for this first patch, we always use the "gss/pseudoflavor"
auth_domain (and only it) if it is available; thus rq_client is ignored in the
auth_gss case, and this patch on its own makes no change in behavior; that
will be left to later patches.
Note on idmap: I'm almost tempted to just replace the auth_domain in the idmap
upcall by a dummy value--no version of idmapd has ever used it, and it's
unlikely anyone really wants to perform idmapping differently depending on the
where the client is (they may want to perform *credential* mapping
differently, but that's a different matter--the idmapper just handles id's
used in getattr and setattr). But I'm updating the idmapd code anyway, just
out of general backwards-compatibility paranoia.
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-07-17 15:04:46 +04:00
|
|
|
static char *
|
|
|
|
rqst_authname(struct svc_rqst *rqstp)
|
|
|
|
{
|
|
|
|
struct auth_domain *clp;
|
|
|
|
|
|
|
|
clp = rqstp->rq_gssclient ? rqstp->rq_gssclient : rqstp->rq_client;
|
|
|
|
return clp->name;
|
|
|
|
}
|
|
|
|
|
2011-01-05 01:53:52 +03:00
|
|
|
static __be32
|
2005-04-17 02:20:36 +04:00
|
|
|
idmap_name_to_id(struct svc_rqst *rqstp, int type, const char *name, u32 namelen,
|
|
|
|
uid_t *id)
|
|
|
|
{
|
|
|
|
struct ent *item, key = {
|
|
|
|
.type = type,
|
|
|
|
};
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (namelen + 1 > sizeof(key.name))
|
2011-01-05 01:53:52 +03:00
|
|
|
return nfserr_badowner;
|
2005-04-17 02:20:36 +04:00
|
|
|
memcpy(key.name, name, namelen);
|
|
|
|
key.name[namelen] = '\0';
|
knfsd: nfsd: set rq_client to ip-address-determined-domain
We want it to be possible for users to restrict exports both by IP address and
by pseudoflavor. The pseudoflavor information has previously been passed
using special auth_domains stored in the rq_client field. After the preceding
patch that stored the pseudoflavor in rq_pflavor, that's now superfluous; so
now we use rq_client for the ip information, as auth_null and auth_unix do.
However, we keep around the special auth_domain in the rq_gssclient field for
backwards compatibility purposes, so we can still do upcalls using the old
"gss/pseudoflavor" auth_domain if upcalls using the unix domain to give us an
appropriate export. This allows us to continue supporting old mountd.
In fact, for this first patch, we always use the "gss/pseudoflavor"
auth_domain (and only it) if it is available; thus rq_client is ignored in the
auth_gss case, and this patch on its own makes no change in behavior; that
will be left to later patches.
Note on idmap: I'm almost tempted to just replace the auth_domain in the idmap
upcall by a dummy value--no version of idmapd has ever used it, and it's
unlikely anyone really wants to perform idmapping differently depending on the
where the client is (they may want to perform *credential* mapping
differently, but that's a different matter--the idmapper just handles id's
used in getattr and setattr). But I'm updating the idmapd code anyway, just
out of general backwards-compatibility paranoia.
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-07-17 15:04:46 +04:00
|
|
|
strlcpy(key.authname, rqst_authname(rqstp), sizeof(key.authname));
|
2005-04-17 02:20:36 +04:00
|
|
|
ret = idmap_lookup(rqstp, nametoid_lookup, &key, &nametoid_cache, &item);
|
|
|
|
if (ret == -ENOENT)
|
2011-01-05 01:53:52 +03:00
|
|
|
return nfserr_badowner;
|
2005-04-17 02:20:36 +04:00
|
|
|
if (ret)
|
2011-01-05 01:53:52 +03:00
|
|
|
return nfserrno(ret);
|
2005-04-17 02:20:36 +04:00
|
|
|
*id = item->id;
|
2006-03-27 13:15:09 +04:00
|
|
|
cache_put(&item->h, &nametoid_cache);
|
2005-04-17 02:20:36 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
idmap_id_to_name(struct svc_rqst *rqstp, int type, uid_t id, char *name)
|
|
|
|
{
|
|
|
|
struct ent *item, key = {
|
|
|
|
.id = id,
|
|
|
|
.type = type,
|
|
|
|
};
|
|
|
|
int ret;
|
|
|
|
|
knfsd: nfsd: set rq_client to ip-address-determined-domain
We want it to be possible for users to restrict exports both by IP address and
by pseudoflavor. The pseudoflavor information has previously been passed
using special auth_domains stored in the rq_client field. After the preceding
patch that stored the pseudoflavor in rq_pflavor, that's now superfluous; so
now we use rq_client for the ip information, as auth_null and auth_unix do.
However, we keep around the special auth_domain in the rq_gssclient field for
backwards compatibility purposes, so we can still do upcalls using the old
"gss/pseudoflavor" auth_domain if upcalls using the unix domain to give us an
appropriate export. This allows us to continue supporting old mountd.
In fact, for this first patch, we always use the "gss/pseudoflavor"
auth_domain (and only it) if it is available; thus rq_client is ignored in the
auth_gss case, and this patch on its own makes no change in behavior; that
will be left to later patches.
Note on idmap: I'm almost tempted to just replace the auth_domain in the idmap
upcall by a dummy value--no version of idmapd has ever used it, and it's
unlikely anyone really wants to perform idmapping differently depending on the
where the client is (they may want to perform *credential* mapping
differently, but that's a different matter--the idmapper just handles id's
used in getattr and setattr). But I'm updating the idmapd code anyway, just
out of general backwards-compatibility paranoia.
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-07-17 15:04:46 +04:00
|
|
|
strlcpy(key.authname, rqst_authname(rqstp), sizeof(key.authname));
|
2005-04-17 02:20:36 +04:00
|
|
|
ret = idmap_lookup(rqstp, idtoname_lookup, &key, &idtoname_cache, &item);
|
|
|
|
if (ret == -ENOENT)
|
|
|
|
return sprintf(name, "%u", id);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
ret = strlen(item->name);
|
|
|
|
BUG_ON(ret > IDMAP_NAMESZ);
|
|
|
|
memcpy(name, item->name, ret);
|
2006-03-27 13:15:09 +04:00
|
|
|
cache_put(&item->h, &idtoname_cache);
|
2005-04-17 02:20:36 +04:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-01-05 01:53:52 +03:00
|
|
|
__be32
|
2005-04-17 02:20:36 +04:00
|
|
|
nfsd_map_name_to_uid(struct svc_rqst *rqstp, const char *name, size_t namelen,
|
|
|
|
__u32 *id)
|
|
|
|
{
|
|
|
|
return idmap_name_to_id(rqstp, IDMAP_TYPE_USER, name, namelen, id);
|
|
|
|
}
|
|
|
|
|
2011-01-05 01:53:52 +03:00
|
|
|
__be32
|
2005-04-17 02:20:36 +04:00
|
|
|
nfsd_map_name_to_gid(struct svc_rqst *rqstp, const char *name, size_t namelen,
|
|
|
|
__u32 *id)
|
|
|
|
{
|
|
|
|
return idmap_name_to_id(rqstp, IDMAP_TYPE_GROUP, name, namelen, id);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
nfsd_map_uid_to_name(struct svc_rqst *rqstp, __u32 id, char *name)
|
|
|
|
{
|
|
|
|
return idmap_id_to_name(rqstp, IDMAP_TYPE_USER, id, name);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
nfsd_map_gid_to_name(struct svc_rqst *rqstp, __u32 id, char *name)
|
|
|
|
{
|
|
|
|
return idmap_id_to_name(rqstp, IDMAP_TYPE_GROUP, id, name);
|
|
|
|
}
|