/* Imported variables */
-extern int afs_shuttingdown;
+extern enum afs_shutdown_state afs_shuttingdown;
/* Exported variables */
afs_uint32 pag_epoch;
-#if defined(UKERNEL) && defined(AFS_WEB_ENHANCEMENTS)
+#if defined(UKERNEL)
afs_uint32 pagCounter = 1;
#else
afs_uint32 pagCounter = 0;
-#endif /* UKERNEL && AFS_WEB_ENHANCEMENTS */
-
-#ifdef AFS_LINUX26_ONEGROUP_ENV
-#define NUMPAGGROUPS 1
-#else
-#define NUMPAGGROUPS 2
-#endif
-/* Local variables */
+#endif /* UKERNEL */
/*
* Pags are implemented as follows: the set of groups whose long
* anyway, so the pag is an alternative handle which is somewhat more
* secure (although of course not absolutely secure).
*/
-#if !defined(UKERNEL) || !defined(AFS_WEB_ENHANCEMENTS)
+#if !defined(UKERNEL)
afs_uint32
genpag(void)
{
return (pagCounter);
#endif
}
-#endif /* UKERNEL && AFS_WEB_ENHANCEMENTS */
+#endif /* UKERNEL */
/* used to require 10 seconds between each setpag to guarantee that
* PAGs never wrap - which would be a security hole. If we presume
static int afs_pag_timewarn = 0;
static int
-afs_pag_sleep(afs_ucred_t **acred)
+afs_pag_sleep(afs_ucred_t *acred)
{
int rv = 0;
}
static int
-afs_pag_wait(afs_ucred_t **acred)
+afs_pag_wait(afs_ucred_t *acred)
{
+ int code = 0;
+
if (afs_pag_sleep(acred)) {
if (!afs_pag_sleepcnt) {
afs_warn("%s() PAG throttling triggered, pid %d... sleeping. sleepcnt %d\n",
afs_pag_sleepcnt++;
do {
- /* XXX spins on EINTR */
- afs_osi_Wait(1000, (struct afs_osi_WaitHandle *)0, 0);
- } while (afs_pag_sleep(acred));
+ code = afs_osi_Wait(1000, (struct afs_osi_WaitHandle *)0, 0);
+ } while (!code && afs_pag_sleep(acred));
afs_pag_sleepcnt--;
}
- return 0;
+ return code;
}
int
afs_setpag(afs_ucred_t **credpp)
#elif defined(AFS_FBSD_ENV)
afs_setpag(struct thread *td, void *args)
+#elif defined(AFS_NBSD_ENV)
+afs_setpag(afs_proc_t *p, const void *args, register_t *retval)
#elif defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
afs_setpag(afs_proc_t *p, void *args, int *retval)
#else
{
#if defined(AFS_SUN5_ENV)
- afs_ucred_t **acred = *credpp;
+ afs_ucred_t *acred = *credpp;
#elif defined(AFS_OBSD_ENV)
- afs_ucred_t **acred = &p->p_ucred;
+ afs_ucred_t *acred = p->p_ucred;
#else
- afs_ucred_t **acred = NULL;
+ afs_ucred_t *acred = NULL;
#endif
int code = 0;
AFS_STATCNT(afs_setpag);
- afs_pag_wait(acred);
+ code = afs_pag_wait(acred);
+ if (code) {
+ goto done;
+ }
#if defined(AFS_SUN5_ENV)
#elif defined(AFS_FBSD_ENV)
code = AddPag(td, genpag(), &td->td_ucred);
#elif defined(AFS_NBSD40_ENV)
- /* XXXX won't work */
- code = AddPag(p, genpag(), (afs_ucred_t **) osi_curcred());
+ code = AddPag(p, genpag(), &p->l_proc->p_cred);
#elif defined(AFS_XBSD_ENV)
code = AddPag(p, genpag(), &p->p_rcred);
#elif defined(AFS_AIX41_ENV)
code = AddPag(genpag(), &u.u_cred);
#endif
+ done:
afs_Trace1(afs_iclSetp, CM_TRACE_SETPAG, ICL_TYPE_INT32, code);
#if defined(KERNEL_HAVE_UERROR)
return (code);
}
-#if defined(UKERNEL) && defined(AFS_WEB_ENHANCEMENTS)
+#if defined(UKERNEL)
/*
* afs_setpag_val
* This function is like setpag but sets the current thread's pag id to a
{
#if defined(AFS_SUN5_ENV)
- afs_ucred_t **acred = *credp;
+ afs_ucred_t *acred = *credp;
#elif defined(AFS_OBSD_ENV)
- afs_ucred_t **acred = &p->p_ucred;
+ afs_ucred_t *acred = p->p_ucred;
#else
- afs_ucred_t **acred = NULL;
+ afs_ucred_t *acred = NULL;
#endif
int code = 0;
AFS_STATCNT(afs_setpag);
- afs_pag_wait(acred);
+ code = afs_pag_wait(acred);
+ if (code) {
+ goto done;
+ }
#if defined(AFS_SUN5_ENV)
code = AddPag(pagval, credpp);
code = AddPag(pagval, &u.u_cred);
#endif
+ done:
afs_Trace1(afs_iclSetp, CM_TRACE_SETPAG, ICL_TYPE_INT32, code);
#if defined(KERNEL_HAVE_UERROR)
if (!getuerror())
return (code);
}
-#ifndef AFS_LINUX26_ONEGROUP_ENV
+#ifndef AFS_PAG_ONEGROUP_ENV
int
afs_getpag_val(void)
{
return pagvalue;
}
#endif
-#endif /* UKERNEL && AFS_WEB_ENHANCEMENTS */
+#endif /* UKERNEL */
/* Note - needs to be available on AIX, others can be static - rework this */
AFS_STATCNT(AddPag);
#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
if ((code = setpag(p, credpp, aval, &newpag, 0)))
-#elif defined(AFS_NBSD40_ENV)
- if ((code = setpag(p, (void *) credpp, aval, &newpag, 0)))
#else
if ((code = setpag(credpp, aval, &newpag, 0)))
#endif
AFS_STATCNT(afs_InitReq);
memset(av, 0, sizeof(*av));
- if (afs_shuttingdown)
+ if (afs_shuttingdown == AFS_SHUTDOWN)
return EIO;
#ifdef AFS_LINUX26_ENV
#elif defined(AFS_SUN510_ENV)
av->uid = crgetruid(acred);
#else
- av->uid = afs_cr_uid(acred); /* default when no pag is set */
+ av->uid = afs_cr_ruid(acred); /* default when no pag is set */
#endif
}
return 0;
}
-#ifndef AFS_LINUX26_ONEGROUP_ENV
+/*!
+ * Allocate and setup a vrequest.
+ *
+ * \note The caller must free the allocated vrequest with
+ * afs_DestroyReq() if this function returns successfully (zero).
+ *
+ * \note The GLOCK must be held on platforms which require the GLOCK
+ * for osi_AllocSmallSpace() and osi_FreeSmallSpace().
+ *
+ * \param[out] avpp address of the vrequest pointer
+ * \param[in] acred user credentials to setup the vrequest
+ * afs_osi_credp should be used for anonymous connections
+ * \return 0 on success
+ */
+int
+afs_CreateReq(struct vrequest **avpp, afs_ucred_t *acred)
+{
+ int code;
+ struct vrequest *treq = NULL;
+
+ if (afs_shuttingdown == AFS_SHUTDOWN) {
+ return EIO;
+ }
+ if (!avpp || !acred) {
+ return EINVAL;
+ }
+ treq = osi_AllocSmallSpace(sizeof(struct vrequest));
+ if (!treq) {
+ return ENOMEM;
+ }
+ code = afs_InitReq(treq, acred);
+ if (code != 0) {
+ osi_FreeSmallSpace(treq);
+ return code;
+ }
+ *avpp = treq;
+ return 0;
+}
+
+/*!
+ * Deallocate a vrequest.
+ *
+ * \note The GLOCK must be held on platforms which require the GLOCK
+ * for osi_FreeSmallSpace().
+ *
+ * \param[in] av pointer to the vrequest to free; may be NULL
+ */
+void
+afs_DestroyReq(struct vrequest *av)
+{
+ if (av) {
+ osi_FreeSmallSpace(av);
+ }
+}
+
afs_uint32
afs_get_pag_from_groups(gid_t g0a, gid_t g1a)
{
h = (g0 >> 14);
h = (g1 >> 14) + h + h + h;
ret = ((h << 28) | l);
-# if defined(UKERNEL) && defined(AFS_WEB_ENHANCEMENTS)
+# if defined(UKERNEL)
return ret;
# else
/* Additional testing */
if (((ret >> 24) & 0xff) == 'A')
return ret;
-# endif /* UKERNEL && AFS_WEB_ENHANCEMENTS */
+# endif /* UKERNEL */
}
return NOPAG;
}
+#ifndef AFS_PAG_ONEGROUP_ENV
void
afs_get_groups_from_pag(afs_uint32 pag, gid_t * g0p, gid_t * g1p)
{
AFS_STATCNT(afs_get_groups_from_pag);
*g0p = pag;
*g1p = 0;
-# if !defined(UKERNEL) || !defined(AFS_WEB_ENHANCEMENTS)
+# if !defined(UKERNEL)
pag &= 0x7fffffff;
-# endif /* UKERNEL && AFS_WEB_ENHANCEMENTS */
+# endif /* UKERNEL */
g0 = 0x3fff & (pag >> 14);
g1 = 0x3fff & pag;
g0 |= ((pag >> 28) / 3) << 14;
*g1p = g1 + 0x3f00;
}
#else
-void afs_get_groups_from_pag(afs_uint32 pag, gid_t *g0p, gid_t *g1p)
+void
+afs_get_groups_from_pag(afs_uint32 pag, gid_t *g0p, gid_t *g1p)
{
AFS_STATCNT(afs_get_groups_from_pag);
*g0p = pag;
}
#endif
-#if !defined(AFS_LINUX26_ENV) && !defined(AFS_DARWIN110_ENV)
+#ifdef AFS_LINUX26_ENV
+/* osi_get_group_pag is defined in <ARCH>/osi_groups.c */
+#elif defined(AFS_PAG_ONEGROUP_ENV)
+/* osi_get_group_pag is defined in <ARCH>/osi_groups.c */
+#elif defined(AFS_DARWIN110_ENV)
+/* We don't have pags, so we do not define an osi_get_group_pag */
+#else
static afs_int32
osi_get_group_pag(afs_ucred_t *cred)
{
ngroups = crgetngroups(cred);
#endif
#if defined(AFS_NBSD40_ENV)
-#warning com afs_ucred_t w/magic will not work
if (cred == NOCRED || cred == FSCRED)
return NOPAG;
if (osi_crngroups(cred) < 3)
return NOPAG;
- g0 = osi_crgroupbyid(cred, 0);
- g1 = osi_crgroupbyid(cred, 1);
+ g0 = osi_crgroupbyid(cred, 1);
+ g1 = osi_crgroupbyid(cred, 2);
#elif defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
if (cred == NOCRED || cred == FSCRED)
return NOPAG;
if (cred->cr_ngrps < 2)
return NOPAG;
# elif defined(AFS_LINUX26_ENV)
- if (afs_cr_group_info(cred)->ngroups < NUMPAGGROUPS)
+ if (afs_cr_group_info(cred)->ngroups < AFS_NUMPAGGROUPS)
return NOPAG;
# elif defined(AFS_SGI_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_XBSD_ENV)
# if defined(AFS_SUN510_ENV)
git://git.openafs.org / openafs.git / blobdiff