*/
#include <afsconfig.h>
#include "afs/param.h"
+#ifdef LINUX_KEYRING_SUPPORT
+#include <linux/seq_file.h>
+#if KEY_TYPE_H_EXISTS
+#include <linux/key-type.h>
+#endif
+#endif
RCSID
("$Header$");
#include "afs/sysincludes.h"
#include "afsincludes.h"
#include "afs/afs_stats.h" /* statistics */
+#include "afs/nfsclient.h"
#ifdef AFS_LINUX22_ENV
#include "h/smp_lock.h"
#endif
+#ifdef AFS_LINUX26_ONEGROUP_ENV
+#define NUMPAGGROUPS 1
+#else
+#define NUMPAGGROUPS 2
+#endif
+
#if defined(AFS_LINUX26_ENV)
static int
afs_setgroups(cred_t **cr, struct group_info *group_info, int change_parent)
afs_getgroups(cred_t *cr, gid_t *groups)
{
int i;
+ int n;
+ gid_t *gp;
+
AFS_STATCNT(afs_getgroups);
- gid_t *gp = cr->cr_groups;
- int n = cr->cr_ngroups;
+ gp = cr->cr_groups;
+ n = cr->cr_ngroups;
for (i = 0; (i < n) && (*gp != (gid_t) NOGROUP); i++)
*groups++ = *gp++;
}
#endif
+#if defined(AFS_LINUX26_ENV)
int
-setpag(cred_t ** cr, afs_uint32 pagvalue, afs_uint32 * newpag,
- int change_parent)
+__setpag(cred_t **cr, afs_uint32 pagvalue, afs_uint32 *newpag,
+ int change_parent)
{
-#if defined(AFS_LINUX26_ENV)
struct group_info *group_info;
gid_t g0, g1;
-
- AFS_STATCNT(setpag);
+ struct group_info *tmp;
+ int i;
+#ifdef AFS_LINUX26_ONEGROUP_ENV
+ int j;
+#endif
+ int need_space = 0;
group_info = afs_getgroups(*cr);
- if (group_info->ngroups < 2
- || afs_get_pag_from_groups(GROUP_AT(group_info, 0),
- GROUP_AT(group_info, 1)) == NOPAG) {
+ if (group_info->ngroups < NUMPAGGROUPS
+ || afs_get_pag_from_groups(
+#ifdef AFS_LINUX26_ONEGROUP_ENV
+ group_info
+#else
+ GROUP_AT(group_info, 0) ,GROUP_AT(group_info, 1)
+#endif
+ ) == NOPAG)
/* We will have to make sure group_info is big enough for pag */
- struct group_info *tmp;
- int i;
-
- tmp = groups_alloc(group_info->ngroups + 2);
- for (i = 0; i < group_info->ngroups; ++i)
- GROUP_AT(tmp, i + 2) = GROUP_AT(group_info, i);
- put_group_info(group_info);
- group_info = tmp;
- }
+ need_space = NUMPAGGROUPS;
+ tmp = groups_alloc(group_info->ngroups + need_space);
+
*newpag = (pagvalue == -1 ? genpag() : pagvalue);
+#ifdef AFS_LINUX26_ONEGROUP_ENV
+ for (i = 0, j = 0; i < group_info->ngroups; ++i) {
+ int ths = GROUP_AT(group_info, i);
+ int last = i > 0 ? GROUP_AT(group_info, i-1) : 0;
+ if ((ths >> 24) == 'A')
+ continue;
+ if (last <= *newpag && ths > *newpag) {
+ GROUP_AT(tmp, j) = *newpag;
+ j++;
+ }
+ GROUP_AT(tmp, j) = ths;
+ j++;
+ }
+ if (j != i + need_space)
+ GROUP_AT(tmp, j) = *newpag;
+#else
+ for (i = 0; i < group_info->ngroups; ++i)
+ GROUP_AT(tmp, i + need_space) = GROUP_AT(group_info, i);
+#endif
+ put_group_info(group_info);
+ group_info = tmp;
+
+#ifndef AFS_LINUX26_ONEGROUP_ENV
afs_get_groups_from_pag(*newpag, &g0, &g1);
GROUP_AT(group_info, 0) = g0;
GROUP_AT(group_info, 1) = g1;
+#endif
afs_setgroups(cr, group_info, change_parent);
put_group_info(group_info);
return 0;
+}
+
+#ifdef LINUX_KEYRING_SUPPORT
+static struct key_type *__key_type_keyring;
+
+static int
+install_session_keyring(struct task_struct *task, struct key *keyring)
+{
+ struct key *old;
+ char desc[20];
+ unsigned long not_in_quota;
+ int code = -EINVAL;
+
+ if (!__key_type_keyring)
+ return code;
+
+ if (!keyring) {
+
+ /* create an empty session keyring */
+ not_in_quota = KEY_ALLOC_IN_QUOTA;
+ sprintf(desc, "_ses.%u", task->tgid);
+
+#ifdef KEY_ALLOC_NEEDS_STRUCT_TASK
+ keyring = key_alloc(__key_type_keyring, desc,
+ task->uid, task->gid, task,
+ (KEY_POS_ALL & ~KEY_POS_SETATTR) | KEY_USR_ALL,
+ not_in_quota);
+#else
+ keyring = key_alloc(__key_type_keyring, desc,
+ task->uid, task->gid,
+ (KEY_POS_ALL & ~KEY_POS_SETATTR) | KEY_USR_ALL,
+ not_in_quota);
+#endif
+ if (IS_ERR(keyring)) {
+ code = PTR_ERR(keyring);
+ goto out;
+ }
+ }
+
+ code = key_instantiate_and_link(keyring, NULL, 0, NULL, NULL);
+ if (code < 0) {
+ key_put(keyring);
+ goto out;
+ }
+
+ /* install the keyring */
+ spin_lock_irq(&task->sighand->siglock);
+ old = task->signal->session_keyring;
+ smp_wmb();
+ task->signal->session_keyring = keyring;
+ spin_unlock_irq(&task->sighand->siglock);
+
+ if (old)
+ key_put(old);
+
+out:
+ return code;
+}
+#endif /* LINUX_KEYRING_SUPPORT */
+
#else
+int
+__setpag(cred_t **cr, afs_uint32 pagvalue, afs_uint32 *newpag,
+ int change_parent)
+{
gid_t *gidset;
afs_int32 ngroups, code = 0;
int j;
- AFS_STATCNT(setpag);
-
gidset = (gid_t *) osi_Alloc(NGROUPS * sizeof(gidset[0]));
ngroups = afs_getgroups(*cr, gidset);
osi_Free((char *)gidset, NGROUPS * sizeof(int));
return code;
+}
+#endif
+
+
+int
+setpag(cred_t **cr, afs_uint32 pagvalue, afs_uint32 *newpag,
+ int change_parent)
+{
+ int code;
+
+ AFS_STATCNT(setpag);
+
+ code = __setpag(cr, pagvalue, newpag, change_parent);
+
+#ifdef LINUX_KEYRING_SUPPORT
+ if (code == 0 && (*cr)->cr_rgid != NFSXLATOR_CRED) {
+ (void) install_session_keyring(current, NULL);
+
+ if (current->signal->session_keyring) {
+ struct key *key;
+ key_perm_t perm;
+
+ perm = KEY_POS_VIEW | KEY_POS_SEARCH;
+ perm |= KEY_USR_VIEW | KEY_USR_SEARCH;
+
+#ifdef KEY_ALLOC_NEEDS_STRUCT_TASK
+ key = key_alloc(&key_type_afs_pag, "_pag", 0, 0, current, perm, 1);
+#else
+ key = key_alloc(&key_type_afs_pag, "_pag", 0, 0, perm, 1);
#endif
+
+ if (!IS_ERR(key)) {
+ key_instantiate_and_link(key, (void *) newpag, sizeof(afs_uint32),
+ current->signal->session_keyring, NULL);
+ key_put(key);
+ }
+ }
+ }
+#endif /* LINUX_KEYRING_SUPPORT */
+
+ return code;
}
/* Intercept the standard system call. */
-extern long (*sys_setgroupsp) (int gidsetsize, gid_t * grouplist);
+extern asmlinkage long (*sys_setgroupsp) (int gidsetsize, gid_t * grouplist);
asmlinkage long
afs_xsetgroups(int gidsetsize, gid_t * grouplist)
{
cr = crref();
if (old_pag != NOPAG && PagInCred(cr) == NOPAG) {
/* re-install old pag if there's room. */
- code = setpag(&cr, old_pag, &junk, 0);
+ code = __setpag(&cr, old_pag, &junk, 0);
}
crfree(cr);
unlock_kernel();
#if defined(AFS_LINUX24_ENV)
/* Intercept the standard uid32 system call. */
-extern long (*sys_setgroups32p) (int gidsetsize, gid_t * grouplist);
+extern asmlinkage long (*sys_setgroups32p) (int gidsetsize, gid_t * grouplist);
asmlinkage long
afs_xsetgroups32(int gidsetsize, gid_t * grouplist)
{
cr = crref();
if (old_pag != NOPAG && PagInCred(cr) == NOPAG) {
/* re-install old pag if there's room. */
- code = setpag(&cr, old_pag, &junk, 0);
+ code = __setpag(&cr, old_pag, &junk, 0);
}
crfree(cr);
unlock_kernel();
cr = crref();
if (old_pag != NOPAG && PagInCred(cr) == NOPAG) {
/* re-install old pag if there's room. */
- code = setpag(&cr, old_pag, &junk, 0);
+ code = __setpag(&cr, old_pag, &junk, 0);
}
crfree(cr);
unlock_kernel();
cr = crref();
if (old_pag != NOPAG && PagInCred(cr) == NOPAG) {
/* re-install old pag if there's room. */
- code = setpag(&cr, old_pag, &junk, 0);
+ code = __setpag(&cr, old_pag, &junk, 0);
}
crfree(cr);
unlock_kernel();
cr = crref();
if (old_pag != NOPAG && PagInCred(cr) == NOPAG) {
/* re-install old pag if there's room. */
- code = setpag(&cr, old_pag, &junk, 0);
+ code = __setpag(&cr, old_pag, &junk, 0);
}
crfree(cr);
unlock_kernel();
#endif
#endif
+
+#ifdef LINUX_KEYRING_SUPPORT
+static void afs_pag_describe(const struct key *key, struct seq_file *m)
+{
+ seq_puts(m, key->description);
+
+ seq_printf(m, ": %u", key->datalen);
+}
+
+static int afs_pag_instantiate(struct key *key, const void *data, size_t datalen)
+{
+ int code;
+ afs_uint32 *userpag, pag = NOPAG;
+ int g0, g1;
+
+ if (key->uid != 0 || key->gid != 0)
+ return -EPERM;
+
+ code = -EINVAL;
+ get_group_info(current->group_info);
+
+ if (datalen != sizeof(afs_uint32) || !data)
+ goto error;
+
+ if (current->group_info->ngroups < NUMPAGGROUPS)
+ goto error;
+
+ /* ensure key being set matches current pag */
+#ifdef AFS_LINUX26_ONEGROUP_ENV
+ pag = afs_get_pag_from_groups(current->group_info);
+#else
+ g0 = GROUP_AT(current->group_info, 0);
+ g1 = GROUP_AT(current->group_info, 1);
+
+ pag = afs_get_pag_from_groups(g0, g1);
+#endif
+ if (pag == NOPAG)
+ goto error;
+
+ userpag = (afs_uint32 *) data;
+ if (*userpag != pag)
+ goto error;
+
+ key->payload.value = (unsigned long) *userpag;
+ key->datalen = sizeof(afs_uint32);
+ code = 0;
+
+error:
+ put_group_info(current->group_info);
+ return code;
+}
+
+static int afs_pag_match(const struct key *key, const void *description)
+{
+ return strcmp(key->description, description) == 0;
+}
+
+static void afs_pag_destroy(struct key *key)
+{
+ afs_uint32 pag = key->payload.value;
+ struct unixuser *pu;
+ int locked = ISAFS_GLOCK();
+
+ if (!locked)
+ AFS_GLOCK();
+ pu = afs_FindUser(pag, -1, READ_LOCK);
+ if (pu) {
+ pu->ct.EndTimestamp = 0;
+ pu->tokenTime = 0;
+ afs_PutUser(pu, READ_LOCK);
+ }
+ if (!locked)
+ AFS_GUNLOCK();
+}
+
+struct key_type key_type_afs_pag =
+{
+ .name = "afs_pag",
+ .describe = afs_pag_describe,
+ .instantiate = afs_pag_instantiate,
+ .match = afs_pag_match,
+ .destroy = afs_pag_destroy,
+};
+
+#ifdef EXPORTED_TASKLIST_LOCK
+extern rwlock_t tasklist_lock __attribute__((weak));
+#endif
+
+void osi_keyring_init(void)
+{
+ struct task_struct *p;
+#ifdef EXPORTED_TASKLIST_LOCK
+ if (&tasklist_lock)
+ read_lock(&tasklist_lock);
+#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
+#ifdef EXPORTED_TASKLIST_LOCK
+ else
+#endif
+ rcu_read_lock();
+#endif
+ p = find_task_by_pid(1);
+ if (p && p->user->session_keyring)
+ __key_type_keyring = p->user->session_keyring->type;
+#ifdef EXPORTED_TASKLIST_LOCK
+ if (&tasklist_lock)
+ read_unlock(&tasklist_lock);
+#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
+#ifdef EXPORTED_TASKLIST_LOCK
+ else
+#endif
+ rcu_read_unlock();
+#endif
+
+ register_key_type(&key_type_afs_pag);
+}
+
+void osi_keyring_shutdown(void)
+{
+ unregister_key_type(&key_type_afs_pag);
+}
+
+#else
+void osi_keyring_init(void)
+{
+ return;
+}
+
+void osi_keyring_shutdown(void)
+{
+ return;
+}
+#endif
git://git.openafs.org / openafs.git / blobdiff