#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)
crset(*cr);
+#if defined(STRUCT_TASK_STRUCT_HAS_PARENT) && !defined(STRUCT_TASK_HAS_CRED)
if (change_parent) {
old_info = current->parent->group_info;
get_group_info(group_info);
current->parent->group_info = group_info;
put_group_info(old_info);
}
+#endif
return (0);
}
int change_parent)
{
struct group_info *group_info;
+#ifndef AFS_LINUX26_ONEGROUP_ENV
gid_t g0, g1;
+#endif
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 */
- need_space = 2;
+ 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;
- *newpag = (pagvalue == -1 ? genpag() : pagvalue);
+#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);
}
#ifdef LINUX_KEYRING_SUPPORT
-static struct key_type *__key_type_keyring;
+extern struct key_type key_type_keyring __attribute__((weak));
+static struct key_type *__key_type_keyring = &key_type_keyring;
static int
install_session_keyring(struct task_struct *task, struct key *keyring)
#ifdef KEY_ALLOC_NEEDS_STRUCT_TASK
keyring = key_alloc(__key_type_keyring, desc,
- task->uid, task->gid, task,
+ task_uid(task), task_gid(task), 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,
+ task_uid(task), task_gid(task),
(KEY_POS_ALL & ~KEY_POS_SETATTR) | KEY_USR_ALL,
not_in_quota);
#endif
/* install the keyring */
spin_lock_irq(&task->sighand->siglock);
- old = task->signal->session_keyring;
+ old = task_session_keyring(task);
smp_wmb();
- task->signal->session_keyring = keyring;
+ task_session_keyring(task) = keyring;
spin_unlock_irq(&task->sighand->siglock);
if (old)
code = __setpag(cr, pagvalue, newpag, change_parent);
#ifdef LINUX_KEYRING_SUPPORT
- if (code == 0) {
-
+ if (code == 0 && (*cr)->cr_rgid != NFSXLATOR_CRED) {
(void) install_session_keyring(current, NULL);
- if (current->signal->session_keyring) {
+ if (current_session_keyring()) {
struct key *key;
key_perm_t perm;
if (!IS_ERR(key)) {
key_instantiate_and_link(key, (void *) newpag, sizeof(afs_uint32),
- current->signal->session_keyring, NULL);
+ current_session_keyring(), NULL);
key_put(key);
}
}
{
int code;
afs_uint32 *userpag, pag = NOPAG;
+#ifndef AFS_LINUX26_ONEGROUP_ENV
int g0, g1;
+#endif
if (key->uid != 0 || key->gid != 0)
return -EPERM;
code = -EINVAL;
- get_group_info(current->group_info);
+ get_group_info(current_group_info());
if (datalen != sizeof(afs_uint32) || !data)
goto error;
- if (current->group_info->ngroups < 2)
+ if (current_group_info()->ngroups < NUMPAGGROUPS)
goto error;
/* ensure key being set matches current pag */
-
- g0 = GROUP_AT(current->group_info, 0);
- g1 = GROUP_AT(current->group_info, 1);
+#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;
code = 0;
error:
- put_group_info(current->group_info);
+ put_group_info(current_group_info());
return code;
}
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;
- p = find_task_by_pid(1);
- if (p && p->user->session_keyring)
- __key_type_keyring = p->user->session_keyring->type;
+ /* If we can't lock the tasklist, either with its explicit lock,
+ * or by using the RCU lock, then we can't safely work out the
+ * type of a keyring. So, we have to rely on the weak reference.
+ * If that's not available, then keyring based PAGs won't work.
+ */
+
+#if defined(EXPORTED_TASKLIST_LOCK) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) && defined(EXPORTED_RCU_READ_LOCK))
+ if (__key_type_keyring == NULL) {
+# ifdef EXPORTED_TASKLIST_LOCK
+ if (&tasklist_lock)
+ read_lock(&tasklist_lock);
+# endif
+# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) && defined(EXPORTED_RCU_READ_LOCK))
+# ifdef EXPORTED_TASKLIST_LOCK
+ else
+# endif
+ rcu_read_lock();
+# endif
+#if defined(EXPORTED_FIND_TASK_BY_PID)
+ p = find_task_by_pid(1);
+#else
+ p = find_task_by_vpid(1);
+#endif
+ if (p && task_user(p)->session_keyring)
+ __key_type_keyring = task_user(p)->session_keyring->type;
+# ifdef EXPORTED_TASKLIST_LOCK
+ if (&tasklist_lock)
+ read_unlock(&tasklist_lock);
+# endif
+# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) && defined(EXPORTED_RCU_READ_LOCK))
+# ifdef EXPORTED_TASKLIST_LOCK
+ else
+# endif
+ rcu_read_unlock();
+# endif
+ }
+#endif
register_key_type(&key_type_afs_pag);
}
git://git.openafs.org / openafs.git / blobdiff