Skip to content

Commit

Permalink
fix getpwnam() thread safe issue
Browse files Browse the repository at this point in the history
Signed-off-by: Donghwa Jeong <dh48.jeong@samsung.com>
  • Loading branch information
2xsec authored and Christian Brauner committed Jun 15, 2018
1 parent 4e9acbf commit 37bafbc
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 11 deletions.
28 changes: 23 additions & 5 deletions src/lxc/pam/pam_cgfs.c
Expand Up @@ -1520,14 +1520,32 @@ static void cg_escape(void)
/* Get uid and gid for @user. */
static bool get_uid_gid(const char *user, uid_t *uid, gid_t *gid)
{
struct passwd *pwent;
strcut passwd pwent;
struct passwd *pwentp = NULL;
char *buf;
size_t bufsize;
int ret;

bufsize = sysconf(_SC_GETPW_R_SIZE_MAX);
if (bufsize == -1)
bufsize = 1024;

buf = malloc(bufsize);
if (!buf)
return false;

ret = getpwnam_r(user, &pwent, buf, bufsize, &pwentp);
if (!pwentp) {
if (ret == 0)
mysyslog(LOG_ERR, "Could not find matched password record.\n", NULL);

pwent = getpwnam(user);
if (!pwent)
free(buf);
return false;
}

*uid = pwent->pw_uid;
*gid = pwent->pw_gid;
*uid = pwent.pw_uid;
*gid = pwent.pw_gid;
free(buf);

return true;
}
Expand Down
34 changes: 28 additions & 6 deletions src/lxc/tools/lxc_unshare.c
Expand Up @@ -82,29 +82,51 @@ static void usage(char *cmd)
static bool lookup_user(const char *optarg, uid_t *uid)
{
char name[TOOL_MAXPATHLEN];
struct passwd *pwent = NULL;
struct passwd pwent;
struct passwd *pwentp = NULL;
char *buf;
size_t bufsize;
int ret;

if (!optarg || (optarg[0] == '\0'))
return false;

bufsize = sysconf(_SC_GETPW_R_SIZE_MAX);
if (bufsize == -1)
bufsize = 1024;

buf = malloc(bufsize);
if (!buf)
return false;

if (sscanf(optarg, "%u", uid) < 1) {
/* not a uid -- perhaps a username */
if (sscanf(optarg, "%s", name) < 1)
return false;

pwent = getpwnam(name);
if (!pwent) {
ret = getpwnam_r(name, &pwent, buf, bufsize, &pwentp);
if (!pwentp) {
if (ret == 0)
fprintf(stderr, "could not find matched password record\n");

fprintf(stderr, "invalid username %s\n", name);
free(buf);
return false;
}
*uid = pwent->pw_uid;
*uid = pwent.pw_uid;
} else {
pwent = getpwuid(*uid);
if (!pwent) {
ret = getpwuid_r(*uid, &pwent, buf, bufsize, &pwentp);
if (!pwentp) {
if (ret == 0)
fprintf(stderr, "could not find matched password record\n");

fprintf(stderr, "invalid uid %u\n", *uid);
free(buf);
return false;
}
}

free(buf);
return true;
}

Expand Down

0 comments on commit 37bafbc

Please sign in to comment.