diff options
| -rw-r--r-- | libglusterfs/src/stack.c | 20 | ||||
| -rw-r--r-- | libglusterfs/src/stack.h | 14 | ||||
| -rw-r--r-- | xlators/mount/fuse/src/fuse-helpers.c | 2 | ||||
| -rw-r--r-- | xlators/protocol/server/src/server-helpers.c | 65 |
4 files changed, 57 insertions, 44 deletions
diff --git a/libglusterfs/src/stack.c b/libglusterfs/src/stack.c index bf905ca0b0e..61c779b0453 100644 --- a/libglusterfs/src/stack.c +++ b/libglusterfs/src/stack.c @@ -63,6 +63,26 @@ create_frame (xlator_t *xl, call_pool_t *pool) } void +call_stack_set_groups (call_stack_t *stack, int ngrps, gid_t **groupbuf_p) +{ + /* We take the ownership of the passed group buffer. */ + + if (ngrps <= SMALL_GROUP_COUNT) { + memcpy (stack->groups_small, *groupbuf_p, + sizeof (gid_t) * ngrps); + stack->groups = stack->groups_small; + GF_FREE (*groupbuf_p); + } else { + stack->groups_large = *groupbuf_p; + stack->groups = stack->groups_large; + } + + stack->ngrps = ngrps; + /* Set a canary. */ + *groupbuf_p = (void *)0xdeadf00d; +} + +void gf_proc_dump_call_frame (call_frame_t *call_frame, const char *key_buf,...) { diff --git a/libglusterfs/src/stack.h b/libglusterfs/src/stack.h index ac395fcc4b0..251a5c25e85 100644 --- a/libglusterfs/src/stack.h +++ b/libglusterfs/src/stack.h @@ -390,26 +390,21 @@ STACK_RESET (call_stack_t *stack) } while (0) -static void -call_stack_set_groups (call_stack_t *stack, int ngrps, gid_t *groupbuf) -{ - stack->groups = groupbuf; - stack->ngrps = ngrps; -} - static inline int call_stack_alloc_groups (call_stack_t *stack, int ngrps) { if (ngrps <= SMALL_GROUP_COUNT) { - call_stack_set_groups (stack, ngrps, stack->groups_small); + stack->groups = stack->groups_small; } else { stack->groups_large = GF_CALLOC (ngrps, sizeof (gid_t), gf_common_mt_groups_t); if (!stack->groups_large) return -1; - call_stack_set_groups (stack, ngrps, stack->groups_large); + stack->groups = stack->groups_large; } + stack->ngrps = ngrps; + return 0; } @@ -507,6 +502,7 @@ copy_frame (call_frame_t *frame) return newframe; } +void call_stack_set_groups (call_stack_t *stack, int ngrps, gid_t **groupbuf_p); void gf_proc_dump_pending_frames(call_pool_t *call_pool); void gf_proc_dump_pending_frames_to_dict (call_pool_t *call_pool, dict_t *dict); diff --git a/xlators/mount/fuse/src/fuse-helpers.c b/xlators/mount/fuse/src/fuse-helpers.c index 3fc6b16c41f..c59ff772cb8 100644 --- a/xlators/mount/fuse/src/fuse-helpers.c +++ b/xlators/mount/fuse/src/fuse-helpers.c @@ -181,7 +181,7 @@ frame_fill_groups (call_frame_t *frame) return; } - call_stack_set_groups (frame->root, ngroups, mygroups); + call_stack_set_groups (frame->root, ngroups, &mygroups); } else { ret = snprintf (filename, sizeof filename, "/proc/%d/status", frame->root->pid); diff --git a/xlators/protocol/server/src/server-helpers.c b/xlators/protocol/server/src/server-helpers.c index 35f6cd00564..7ff5f16e7f0 100644 --- a/xlators/protocol/server/src/server-helpers.c +++ b/xlators/protocol/server/src/server-helpers.c @@ -31,13 +31,24 @@ gid_resolve (server_conf_t *conf, call_stack_t *root) struct passwd *result; gid_t *mygroups = NULL; gid_list_t gl; - const gid_list_t *agl; int ngroups; + const gid_list_t *agl; agl = gid_cache_lookup (&conf->gid_cache, root->uid, 0, 0); if (agl) { root->ngrps = agl->gl_count; - goto fill_groups; + + if (root->ngrps > 0) { + ret = call_stack_alloc_groups (root, agl->gl_count); + if (ret == 0) { + memcpy (root->groups, agl->gl_list, + sizeof (gid_t) * agl->gl_count); + } + } + + gid_cache_release (&conf->gid_cache, agl); + + return ret; } ret = getpwuid_r (root->uid, &mypw, mystrs, sizeof(mystrs), &result); @@ -66,42 +77,28 @@ gid_resolve (server_conf_t *conf, call_stack_t *root) } root->ngrps = (uint16_t) ngroups; -fill_groups: - if (agl) { - /* the gl is not complete, we only use gl.gl_list later on */ - gl.gl_list = agl->gl_list; - } else { - /* setup a full gid_list_t to add it to the gid_cache */ - gl.gl_id = root->uid; - gl.gl_uid = root->uid; - gl.gl_gid = root->gid; - gl.gl_count = root->ngrps; - - gl.gl_list = GF_MALLOC (root->ngrps * sizeof(gid_t), - gf_common_mt_groups_t); - if (gl.gl_list) - memcpy (gl.gl_list, mygroups, - sizeof(gid_t) * root->ngrps); - else { - GF_FREE (mygroups); - return -1; - } + /* setup a full gid_list_t to add it to the gid_cache */ + gl.gl_id = root->uid; + gl.gl_uid = root->uid; + gl.gl_gid = root->gid; + gl.gl_count = root->ngrps; + + gl.gl_list = GF_MALLOC (root->ngrps * sizeof(gid_t), + gf_common_mt_groups_t); + if (gl.gl_list) + memcpy (gl.gl_list, mygroups, + sizeof(gid_t) * root->ngrps); + else { + GF_FREE (mygroups); + return -1; } - if (root->ngrps == 0) { - ret = 0; - goto out; + if (root->ngrps > 0) { + call_stack_set_groups (root, root->ngrps, &mygroups); } - call_stack_set_groups (root, root->ngrps, mygroups); - -out: - if (agl) { - gid_cache_release (&conf->gid_cache, agl); - } else { - if (gid_cache_add (&conf->gid_cache, &gl) != 1) - GF_FREE (gl.gl_list); - } + if (gid_cache_add (&conf->gid_cache, &gl) != 1) + GF_FREE (gl.gl_list); return ret; } |