Use openpam_check_path_owner_perms()
git-svn-id: svn+ssh://svn.openpam.org/svn/openpam/trunk@502 185d5e19-27fe-0310-9dcf-9bff6b9f3609
This commit is contained in:
parent
996a845863
commit
dd498bc7ad
|
@ -39,12 +39,8 @@
|
||||||
# include "config.h"
|
# include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <sys/stat.h>
|
|
||||||
|
|
||||||
#include <dlfcn.h>
|
#include <dlfcn.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <libgen.h>
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
@ -58,30 +54,6 @@
|
||||||
#define RTLD_NOW RTLD_LAZY
|
#define RTLD_NOW RTLD_LAZY
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
|
||||||
* OpenPAM internal
|
|
||||||
*
|
|
||||||
* Verify that a file or directory is owned by either root or the
|
|
||||||
* arbitrator and that it is not writable by group or other.
|
|
||||||
*/
|
|
||||||
|
|
||||||
static int
|
|
||||||
check_owner_perms(const char *path)
|
|
||||||
{
|
|
||||||
struct stat sb;
|
|
||||||
|
|
||||||
if (stat(path, &sb) != 0)
|
|
||||||
return (-1);
|
|
||||||
if ((sb.st_uid != 0 && sb.st_uid != geteuid()) ||
|
|
||||||
(sb.st_mode & (S_IWGRP|S_IWOTH)) != 0) {
|
|
||||||
openpam_log(PAM_LOG_ERROR,
|
|
||||||
"%s: insecure ownership or permissions", path);
|
|
||||||
errno = EPERM;
|
|
||||||
return (-1);
|
|
||||||
}
|
|
||||||
return (0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* OpenPAM internal
|
* OpenPAM internal
|
||||||
*
|
*
|
||||||
|
@ -91,22 +63,10 @@ check_owner_perms(const char *path)
|
||||||
static void *
|
static void *
|
||||||
try_dlopen(const char *modfn)
|
try_dlopen(const char *modfn)
|
||||||
{
|
{
|
||||||
char *moddn;
|
|
||||||
int ok, serrno;
|
|
||||||
|
|
||||||
/*
|
if (openpam_check_path_owner_perms(modfn) != 0)
|
||||||
* BSD dirname(3) returns a pointer to a static buffer, while GNU
|
|
||||||
* dirname(3) modifies the input string. Use a copy of the string
|
|
||||||
* so both cases work.
|
|
||||||
*/
|
|
||||||
if ((moddn = strdup(modfn)) == NULL)
|
|
||||||
return (NULL);
|
return (NULL);
|
||||||
ok = (check_owner_perms(dirname(moddn)) == 0 &&
|
return (dlopen(modfn, RTLD_NOW));
|
||||||
check_owner_perms(modfn) == 0);
|
|
||||||
serrno = errno;
|
|
||||||
FREE(moddn);
|
|
||||||
errno = serrno;
|
|
||||||
return (ok ? dlopen(modfn, RTLD_NOW) : NULL);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue