* lib/prototypes.h, configure.in, libmisc/Makefile.am,
libmisc/xgetXXbyYY.c, libmisc/xgetpwnam.c, libmisc/xgetpwuid.c,
libmisc/xgetgrnam.c, libmisc/xgetgrgid.c, libmisc/xgetspnam.c:
Added functions xgetpwnam(), xgetpwuid(), xgetgrnam(),
xgetgrgid(), and xgetspnam(). They allocate memory for the
returned structure and are more robust to successive calls. They
are implemented with the libc's getxxyyy_r() functions if
available.
* libmisc/limits.c, libmisc/entry.c, libmisc/chowntty.c,
libmisc/addgrps.c, libmisc/myname.c, libmisc/rlogin.c,
libmisc/pwdcheck.c, src/newgrp.c, src/login_nopam.c,
src/userdel.c, src/lastlog.c, src/grpck.c, src/gpasswd.c,
src/newusers.c, src/chpasswd.c, src/chfn.c, src/groupmems.c,
src/usermod.c, src/expiry.c, src/groupdel.c, src/chgpasswd.c,
src/su.c, src/useradd.c, src/groupmod.c, src/passwd.c, src/pwck.c,
src/groupadd.c, src/chage.c, src/login.c, src/suauth.c,
src/faillog.c, src/groups.c, src/chsh.c, src/id.c: Review all the
usage of one of the getpwnam(), getpwuid(), getgrnam(),
getgrgid(), and getspnam() functions. It was noticed on
http://bugs.debian.org/341230 that chfn and chsh use a passwd
structure after calling a pam function, which result in using
information from the passwd structure requested by pam, not the
original one. It is much easier to use the new xget... functions
to avoid these issues. I've checked which call to the original
get... functions could be left (reducing the scope of the
structure if possible), and I've left comments to ease future
reviews (e.g. /* local, no need for xgetpwnam */).
Note: the getpwent/getgrent calls should probably be checked also.
* src/groupdel.c, src/expiry.c: Fix typos in comments.
* src/groupmod.c: Re-indent.
* libmisc/Makefile.am, lib/groupmem.c, lib/groupio.c, lib/pwmem.c,
lib/pwio.c, lib/shadowmem.c, lib/shadowio.c: Move the __<xx>_dup
functions (used by the xget... functions) from the <xx>io.c files
to the new <xx>mem.c files. This avoid linking some utils against
the SELinux library.
2007-11-19 04:45:26 +05:30
|
|
|
|
/*
|
|
|
|
|
* According to the Linux-PAM documentation:
|
|
|
|
|
*
|
|
|
|
|
* 4.1. Care about standard library calls
|
|
|
|
|
*
|
|
|
|
|
* In general, writers of authorization-granting applications should
|
|
|
|
|
* assume that each module is likely to call any or all 'libc' functions.
|
|
|
|
|
* For 'libc' functions that return pointers to static/dynamically
|
|
|
|
|
* allocated structures (ie. the library allocates the memory and the
|
|
|
|
|
* user is not expected to 'free()' it) any module call to this function
|
|
|
|
|
* is likely to corrupt a pointer previously obtained by the application.
|
|
|
|
|
* The application programmer should either re-call such a 'libc'
|
|
|
|
|
* function after a call to the Linux-PAM library, or copy the structure
|
|
|
|
|
* contents to some safe area of memory before passing control to the
|
|
|
|
|
* Linux-PAM library.
|
|
|
|
|
*
|
|
|
|
|
* Two important function classes that fall into this category are
|
|
|
|
|
* getpwnam(3) and syslog(3).
|
|
|
|
|
*
|
|
|
|
|
* This file provide wrapper to the getpwnam or getpwnam_r functions.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <stdio.h>
|
2008-01-05 19:02:32 +05:30
|
|
|
|
#include <config.h>
|
* lib/prototypes.h, configure.in, libmisc/Makefile.am,
libmisc/xgetXXbyYY.c, libmisc/xgetpwnam.c, libmisc/xgetpwuid.c,
libmisc/xgetgrnam.c, libmisc/xgetgrgid.c, libmisc/xgetspnam.c:
Added functions xgetpwnam(), xgetpwuid(), xgetgrnam(),
xgetgrgid(), and xgetspnam(). They allocate memory for the
returned structure and are more robust to successive calls. They
are implemented with the libc's getxxyyy_r() functions if
available.
* libmisc/limits.c, libmisc/entry.c, libmisc/chowntty.c,
libmisc/addgrps.c, libmisc/myname.c, libmisc/rlogin.c,
libmisc/pwdcheck.c, src/newgrp.c, src/login_nopam.c,
src/userdel.c, src/lastlog.c, src/grpck.c, src/gpasswd.c,
src/newusers.c, src/chpasswd.c, src/chfn.c, src/groupmems.c,
src/usermod.c, src/expiry.c, src/groupdel.c, src/chgpasswd.c,
src/su.c, src/useradd.c, src/groupmod.c, src/passwd.c, src/pwck.c,
src/groupadd.c, src/chage.c, src/login.c, src/suauth.c,
src/faillog.c, src/groups.c, src/chsh.c, src/id.c: Review all the
usage of one of the getpwnam(), getpwuid(), getgrnam(),
getgrgid(), and getspnam() functions. It was noticed on
http://bugs.debian.org/341230 that chfn and chsh use a passwd
structure after calling a pam function, which result in using
information from the passwd structure requested by pam, not the
original one. It is much easier to use the new xget... functions
to avoid these issues. I've checked which call to the original
get... functions could be left (reducing the scope of the
structure if possible), and I've left comments to ease future
reviews (e.g. /* local, no need for xgetpwnam */).
Note: the getpwent/getgrent calls should probably be checked also.
* src/groupdel.c, src/expiry.c: Fix typos in comments.
* src/groupmod.c: Re-indent.
* libmisc/Makefile.am, lib/groupmem.c, lib/groupio.c, lib/pwmem.c,
lib/pwio.c, lib/shadowmem.c, lib/shadowio.c: Move the __<xx>_dup
functions (used by the xget... functions) from the <xx>io.c files
to the new <xx>mem.c files. This avoid linking some utils against
the SELinux library.
2007-11-19 04:45:26 +05:30
|
|
|
|
#include "prototypes.h"
|
|
|
|
|
|
|
|
|
|
#define XFUNCTION_NAME XPREFIX (FUNCTION_NAME)
|
|
|
|
|
#define XPREFIX(name) XPREFIX1 (name)
|
|
|
|
|
#define XPREFIX1(name) x##name
|
|
|
|
|
#define REENTRANT_NAME APPEND_R (FUNCTION_NAME)
|
|
|
|
|
#define APPEND_R(name) APPEND_R1 (name)
|
|
|
|
|
#define APPEND_R1(name) name##_r
|
|
|
|
|
#define STRINGIZE(name) STRINGIZE1 (name)
|
|
|
|
|
#define STRINGIZE1(name) #name
|
|
|
|
|
|
|
|
|
|
LOOKUP_TYPE *XFUNCTION_NAME (ARG_TYPE ARG_NAME)
|
|
|
|
|
{
|
|
|
|
|
#if HAVE_FUNCTION_R
|
|
|
|
|
LOOKUP_TYPE *result=NULL;
|
|
|
|
|
char *buffer=NULL;
|
|
|
|
|
/* we have to start with something */
|
|
|
|
|
size_t length = 0x100;
|
|
|
|
|
|
|
|
|
|
result = malloc(sizeof(LOOKUP_TYPE));
|
|
|
|
|
if (NULL == result) {
|
|
|
|
|
fprintf (stderr, _("%s: out of memory\n"),
|
|
|
|
|
"x" STRINGIZE(FUNCTION_NAME));
|
|
|
|
|
exit (13);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
do {
|
|
|
|
|
int status;
|
|
|
|
|
LOOKUP_TYPE *resbuf = NULL;
|
|
|
|
|
buffer = (char *)realloc (buffer, length);
|
|
|
|
|
if (NULL == buffer) {
|
|
|
|
|
fprintf (stderr, _("%s: out of memory\n"),
|
|
|
|
|
"x" STRINGIZE(FUNCTION_NAME));
|
|
|
|
|
exit (13);
|
|
|
|
|
}
|
|
|
|
|
errno = 0;
|
|
|
|
|
status = REENTRANT_NAME(ARG_NAME, result, buffer,
|
|
|
|
|
length, &resbuf);
|
|
|
|
|
if (!status && (resbuf == result)) {
|
|
|
|
|
/* Build a result structure that can be freed by
|
|
|
|
|
* the shadow *_free functions. */
|
|
|
|
|
LOOKUP_TYPE *ret_result = DUP_FUNCTION(result);
|
|
|
|
|
free(buffer);
|
|
|
|
|
free(result);
|
|
|
|
|
return ret_result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (ERANGE != errno) {
|
|
|
|
|
free (buffer);
|
|
|
|
|
free (result);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
length *= 4;
|
|
|
|
|
} while (length < MAX_LENGTH);
|
|
|
|
|
|
|
|
|
|
free(buffer);
|
|
|
|
|
free(result);
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
#else /* !HAVE_FUNCTION_R */
|
|
|
|
|
|
|
|
|
|
/* No reentrant function.
|
|
|
|
|
* Duplicate the structure to avoid other call to overwrite it.
|
|
|
|
|
*
|
|
|
|
|
* We should also restore the initial structure. But that would be
|
|
|
|
|
* overkill.
|
|
|
|
|
*/
|
|
|
|
|
LOOKUP_TYPE *result = FUNCTION_NAME(ARG_NAME);
|
|
|
|
|
|
|
|
|
|
if (result) {
|
2008-01-01 20:18:04 +05:30
|
|
|
|
result = DUP_FUNCTION(result);
|
* lib/prototypes.h, configure.in, libmisc/Makefile.am,
libmisc/xgetXXbyYY.c, libmisc/xgetpwnam.c, libmisc/xgetpwuid.c,
libmisc/xgetgrnam.c, libmisc/xgetgrgid.c, libmisc/xgetspnam.c:
Added functions xgetpwnam(), xgetpwuid(), xgetgrnam(),
xgetgrgid(), and xgetspnam(). They allocate memory for the
returned structure and are more robust to successive calls. They
are implemented with the libc's getxxyyy_r() functions if
available.
* libmisc/limits.c, libmisc/entry.c, libmisc/chowntty.c,
libmisc/addgrps.c, libmisc/myname.c, libmisc/rlogin.c,
libmisc/pwdcheck.c, src/newgrp.c, src/login_nopam.c,
src/userdel.c, src/lastlog.c, src/grpck.c, src/gpasswd.c,
src/newusers.c, src/chpasswd.c, src/chfn.c, src/groupmems.c,
src/usermod.c, src/expiry.c, src/groupdel.c, src/chgpasswd.c,
src/su.c, src/useradd.c, src/groupmod.c, src/passwd.c, src/pwck.c,
src/groupadd.c, src/chage.c, src/login.c, src/suauth.c,
src/faillog.c, src/groups.c, src/chsh.c, src/id.c: Review all the
usage of one of the getpwnam(), getpwuid(), getgrnam(),
getgrgid(), and getspnam() functions. It was noticed on
http://bugs.debian.org/341230 that chfn and chsh use a passwd
structure after calling a pam function, which result in using
information from the passwd structure requested by pam, not the
original one. It is much easier to use the new xget... functions
to avoid these issues. I've checked which call to the original
get... functions could be left (reducing the scope of the
structure if possible), and I've left comments to ease future
reviews (e.g. /* local, no need for xgetpwnam */).
Note: the getpwent/getgrent calls should probably be checked also.
* src/groupdel.c, src/expiry.c: Fix typos in comments.
* src/groupmod.c: Re-indent.
* libmisc/Makefile.am, lib/groupmem.c, lib/groupio.c, lib/pwmem.c,
lib/pwio.c, lib/shadowmem.c, lib/shadowio.c: Move the __<xx>_dup
functions (used by the xget... functions) from the <xx>io.c files
to the new <xx>mem.c files. This avoid linking some utils against
the SELinux library.
2007-11-19 04:45:26 +05:30
|
|
|
|
if (NULL == result) {
|
|
|
|
|
fprintf (stderr, _("%s: out of memory\n"),
|
|
|
|
|
"x" STRINGIZE(FUNCTION_NAME));
|
|
|
|
|
exit (13);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|