X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fl_getidentity.c;h=936f4945a276d18c2df77a75c05f77897094b4e2;hb=5dc8981d3e2cb98114d6b0b3fa35bc5fc75d6df1;hp=ae4c437935e90e59b3653eeddba5704c52e5b561;hpb=cefa8cda2ba2d288ccaa4ec077a6c627592503ea;p=fs%2Flustre-release.git diff --git a/lustre/utils/l_getidentity.c b/lustre/utils/l_getidentity.c index ae4c437..936f494 100644 --- a/lustre/utils/l_getidentity.c +++ b/lustre/utils/l_getidentity.c @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,8 +24,10 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2011, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -76,7 +76,7 @@ static void usage(void) fprintf(stderr, "\nusage: %s {mdtname} {uid}\n" "Normally invoked as an upcall from Lustre, set via:\n" - " /proc/fs/lustre/mdt/{mdtname}/identity_upcall\n", + "/proc/fs/lustre/mdt/${mdtname}/identity_upcall\n", progname); } @@ -89,73 +89,79 @@ static void errlog(const char *fmt, ...) { va_list args; - openlog(progname, LOG_PERROR, LOG_AUTHPRIV); + openlog(progname, LOG_PERROR | LOG_PID, LOG_AUTHPRIV); va_start(args, fmt); vsyslog(LOG_NOTICE, fmt, args); - fprintf(stderr, fmt, args); va_end(args); closelog(); } -int get_groups_local(struct identity_downcall_data *data) +int get_groups_local(struct identity_downcall_data *data, + unsigned int maxgroups) { - int maxgroups; - gid_t *groups; - unsigned int ngroups = 0; - struct passwd *pw; - struct group *gr; - char *pw_name; - int namelen; - int i; - - pw = getpwuid(data->idd_uid); - if (!pw) { - errlog("no such user %u\n", data->idd_uid); - data->idd_err = errno ? errno : EIDRM; - return -1; - } - data->idd_gid = pw->pw_gid; - - namelen = sysconf(_SC_LOGIN_NAME_MAX); - if (namelen < _POSIX_LOGIN_NAME_MAX) - namelen = _POSIX_LOGIN_NAME_MAX; - pw_name = (char *)malloc(namelen); - if (!pw_name) { - errlog("malloc error\n"); - data->idd_err = errno; - return -1; - } - memset(pw_name, 0, namelen); - strncpy(pw_name, pw->pw_name, namelen - 1); - - maxgroups = sysconf(_SC_NGROUPS_MAX); - if (maxgroups > NGROUPS_MAX) - maxgroups = NGROUPS_MAX; - groups = data->idd_groups; - - groups[ngroups++] = pw->pw_gid; - while ((gr = getgrent())) { - if (gr->gr_gid == groups[0]) - continue; - if (!gr->gr_mem) - continue; - for (i = 0; gr->gr_mem[i]; i++) { - if (!strcmp(gr->gr_mem[i], pw_name)) { - groups[ngroups++] = gr->gr_gid; - break; - } - } - if (ngroups == maxgroups) - break; - } - endgrent(); - qsort(groups, ngroups, sizeof(*groups), compare_u32); - data->idd_ngroups = ngroups; - - free(pw_name); - return 0; + gid_t *groups, *groups_tmp = NULL; + unsigned int ngroups = 0; + int ngroups_tmp; + struct passwd *pw; + char *pw_name; + int namelen; + int i; + + pw = getpwuid(data->idd_uid); + if (!pw) { + errlog("no such user %u\n", data->idd_uid); + data->idd_err = errno ? errno : EIDRM; + return -1; + } + + data->idd_gid = pw->pw_gid; + namelen = sysconf(_SC_LOGIN_NAME_MAX); + if (namelen < _POSIX_LOGIN_NAME_MAX) + namelen = _POSIX_LOGIN_NAME_MAX; + + pw_name = malloc(namelen); + if (!pw_name) { + errlog("malloc error\n"); + data->idd_err = errno; + return -1; + } + + memset(pw_name, 0, namelen); + strncpy(pw_name, pw->pw_name, namelen - 1); + groups = data->idd_groups; + + /* Allocate array of size maxgroups instead of handling two + * consecutive and potentially racy getgrouplist() calls. */ + groups_tmp = malloc(maxgroups * sizeof(gid_t)); + if (groups_tmp == NULL) { + free(pw_name); + errlog("malloc error\n"); + return -1; + } + + ngroups_tmp = maxgroups; + if (getgrouplist(pw->pw_name, pw->pw_gid, groups_tmp, &ngroups_tmp) < + 0) { + free(pw_name); + free(groups_tmp); + errlog("getgrouplist() error\n"); + return -1; + } + + /* Do not place user's group ID in to the resulting groups list */ + for (i = 0; i < ngroups_tmp; i++) + if (pw->pw_gid != groups_tmp[i]) + groups[ngroups++] = groups_tmp[i]; + + if (ngroups > 0) + qsort(groups, ngroups, sizeof(*groups), compare_u32); + data->idd_ngroups = ngroups; + + free(pw_name); + free(groups_tmp); + return 0; } static inline int comment_line(char *line) @@ -180,7 +186,6 @@ static inline int match_uid(uid_t uid, const char *str) uid2 = strtoul(str, &end, 0); if (*end) return 0; - return (uid == uid2); } @@ -341,20 +346,36 @@ int parse_perm_line(struct identity_downcall_data *data, char *line) return 0; } -int get_perms(FILE *fp, struct identity_downcall_data *data) +int get_perms(struct identity_downcall_data *data) { + FILE *fp; char line[1024]; + fp = fopen(PERM_PATHNAME, "r"); + if (fp == NULL) { + if (errno == ENOENT) { + return 0; + } else { + errlog("open %s failed: %s\n", + PERM_PATHNAME, strerror(errno)); + data->idd_err = errno; + return -1; + } + } + while (fgets(line, 1024, fp)) { if (comment_line(line)) continue; if (parse_perm_line(data, line)) { errlog("parse line %s failed!\n", line); + data->idd_err = EINVAL; + fclose(fp); return -1; } } + fclose(fp); return 0; } @@ -368,9 +389,9 @@ static void show_result(struct identity_downcall_data *data) return; } - printf("uid=%d gid=", data->idd_uid); + printf("uid=%d gid=%d", data->idd_uid, data->idd_gid); for (i = 0; i < data->idd_ngroups; i++) - printf("%s%u", i > 0 ? "," : "", data->idd_groups[i]); + printf(",%u", data->idd_groups[i]); printf("\n"); printf("permissions:\n" " nid\t\t\tperm\n"); @@ -386,56 +407,58 @@ static void show_result(struct identity_downcall_data *data) int main(int argc, char **argv) { - FILE *perms_fp; char *end; - struct identity_downcall_data *data; + struct identity_downcall_data *data = NULL; char procname[1024]; unsigned long uid; - int fd, rc; + int fd, rc = -EINVAL, size, maxgroups; progname = basename(argv[0]); - if (argc != 3) { usage(); - return 1; + goto out; } uid = strtoul(argv[2], &end, 0); if (*end) { errlog("%s: invalid uid '%s'\n", progname, argv[2]); - usage(); - return 1; + goto out; } - data = malloc(sizeof(*data)); + maxgroups = sysconf(_SC_NGROUPS_MAX); + if (maxgroups > NGROUPS_MAX) + maxgroups = NGROUPS_MAX; + if (maxgroups == -1) { + rc = -EINVAL; + goto out; + } + + size = offsetof(struct identity_downcall_data, idd_groups[maxgroups]); + data = malloc(size); if (!data) { - errlog("malloc identity downcall data(%d) failed!\n", - sizeof(*data)); - return 1; + errlog("malloc identity downcall data(%d) failed!\n", size); + rc = -ENOMEM; + goto out; } - memset(data, 0, sizeof(*data)); + + memset(data, 0, size); data->idd_magic = IDENTITY_DOWNCALL_MAGIC; data->idd_uid = uid; - /* get groups for uid */ - rc = get_groups_local(data); + rc = get_groups_local(data, maxgroups); if (rc) goto downcall; + size = offsetof(struct identity_downcall_data, + idd_groups[data->idd_ngroups]); /* read permission database */ - perms_fp = fopen(PERM_PATHNAME, "r"); - if (perms_fp) { - get_perms(perms_fp, data); - fclose(perms_fp); - } else if (errno != ENOENT) { - errlog("open %s failed: %s\n", - PERM_PATHNAME, strerror(errno)); - } + rc = get_perms(data); downcall: if (getenv("L_GETIDENTITY_TEST")) { show_result(data); - return 0; + rc = 0; + goto out; } snprintf(procname, sizeof(procname), @@ -443,15 +466,21 @@ downcall: fd = open(procname, O_WRONLY); if (fd < 0) { errlog("can't open file %s: %s\n", procname, strerror(errno)); - return 1; + rc = -1; + goto out; } - rc = write(fd, data, sizeof(*data)); + rc = write(fd, data, size); close(fd); - if (rc != sizeof(*data)) { + if (rc != size) { errlog("partial write ret %d: %s\n", rc, strerror(errno)); - return 1; + rc = -1; + } else { + rc = 0; } - return 0; +out: + if (data != NULL) + free(data); + return rc; }