tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 16:24:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move prctl PR_SET_DUMPABLE into platform.c.

Browse Source 
This should make it easier to add additional platform support such as
Solaris (bz#2584).
This commit is contained in:
Darren Tucker 2016-06-09 16:23:07 +10:00
parent e6508898c3
commit 0fb7f59853
5 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.in
View File

@ -92,13 +92,13 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \
kex.o kexdh.o kexgex.o kexecdh.o kexc25519.o \ kex.o kexdh.o kexgex.o kexecdh.o kexc25519.o \
kexdhc.o kexgexc.o kexecdhc.o kexc25519c.o \ kexdhc.o kexgexc.o kexecdhc.o kexc25519c.o \
kexdhs.o kexgexs.o kexecdhs.o kexc25519s.o \ kexdhs.o kexgexs.o kexecdhs.o kexc25519s.o \
platform-pledge.o platform.o platform-pledge.o
SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
sshconnect.o sshconnect1.o sshconnect2.o mux.o sshconnect.o sshconnect1.o sshconnect2.o mux.o
SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
audit.o audit-bsm.o audit-linux.o platform.o \ audit.o audit-bsm.o audit-linux.o \
sshpty.o sshlogin.o servconf.o serverloop.o \ sshpty.o sshlogin.o servconf.o serverloop.o \
auth.o auth1.o auth2.o auth-options.o session.o \ auth.o auth1.o auth2.o auth-options.o session.o \
auth-chall.o auth2-chall.o groupaccess.o \ auth-chall.o auth2-chall.o groupaccess.o \

14
platform.c
View File

@ -19,6 +19,9 @@
#include "includes.h" #include "includes.h"
#include <sys/types.h> #include <sys/types.h>
#if defined(HAVE_SYS_PRCTL_H)
#include <sys/prctl.h> /* For prctl() and PR_SET_DUMPABLE */
#endif
#include <stdarg.h> #include <stdarg.h>
#include <unistd.h> #include <unistd.h>
@ -217,3 +220,14 @@ platform_sys_dir_uid(uid_t uid)
#endif #endif
return 0; return 0;
} }
void
platform_disable_tracing(int strict)
{
#if defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE)
/* Disable ptrace on Linux without sgid bit */
if (prctl(PR_SET_DUMPABLE, 0) != 0)
if (strict)
fatal("unable to make the process undumpable");
#endif
}

1
platform.h
View File

@ -31,6 +31,7 @@ void platform_setusercontext_post_groups(struct passwd *);
char *platform_get_krb5_client(const char *); char *platform_get_krb5_client(const char *);
char *platform_krb5_get_principal_name(const char *); char *platform_krb5_get_principal_name(const char *);
int platform_sys_dir_uid(uid_t); int platform_sys_dir_uid(uid_t);
void platform_disable_tracing(int);
/* in platform-pledge.c */ /* in platform-pledge.c */
void platform_pledge_agent(void); void platform_pledge_agent(void);

10
sftp-server.c
View File

@ -29,9 +29,6 @@
#ifdef HAVE_SYS_STATVFS_H #ifdef HAVE_SYS_STATVFS_H
#include <sys/statvfs.h> #include <sys/statvfs.h>
#endif #endif
#ifdef HAVE_SYS_PRCTL_H
#include <sys/prctl.h>
#endif
#include <dirent.h> #include <dirent.h>
#include <errno.h> #include <errno.h>
@ -1588,16 +1585,13 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw)
log_init(__progname, log_level, log_facility, log_stderr); log_init(__progname, log_level, log_facility, log_stderr);
#if defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE)
/* /*
* On Linux, we should try to avoid making /proc/self/{mem,maps} * On platforms where we can, avoid making /proc/self/{mem,maps}
* available to the user so that sftp access doesn't automatically * available to the user so that sftp access doesn't automatically
* imply arbitrary code execution access that will break * imply arbitrary code execution access that will break
* restricted configurations. * restricted configurations.
*/ */
if (prctl(PR_SET_DUMPABLE, 0) != 0) platform_disable_tracing(1); /* strict */
fatal("unable to make the process undumpable");
#endif /* defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE) */
/* Drop any fine-grained privileges we don't need */ /* Drop any fine-grained privileges we don't need */
platform_pledge_sftp_server(); platform_pledge_sftp_server();

9
ssh-agent.c
View File

@ -88,10 +88,6 @@
#include "ssh-pkcs11.h" #include "ssh-pkcs11.h"
#endif #endif
#if defined(HAVE_SYS_PRCTL_H)
#include <sys/prctl.h> /* For prctl() and PR_SET_DUMPABLE */
#endif
typedef enum { typedef enum {
AUTH_UNUSED, AUTH_UNUSED,
AUTH_SOCKET, AUTH_SOCKET,
@ -1209,10 +1205,7 @@ main(int ac, char **av)
setegid(getgid()); setegid(getgid());
setgid(getgid()); setgid(getgid());
#if defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE) platform_disable_tracing(0); /* strict=no */
/* Disable ptrace on Linux without sgid bit */
prctl(PR_SET_DUMPABLE, 0);
#endif
#ifdef WITH_OPENSSL #ifdef WITH_OPENSSL
OpenSSL_add_all_algorithms(); OpenSSL_add_all_algorithms();