isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Apply Google inclusive language guidelines.

Browse Source 
Also replace backwards with backward.
This commit is contained in:
Todd C. Miller
2020-10-30 10:15:30 -06:00
parent 973da9a591
commit e0c2635fb3
52 changed files with 158 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/sudo_noexec.c
View File

@@ -64,100 +64,100 @@ typedef struct interpose_s {
void *orig_func;
} interpose_t;
# define FN_NAME(fn) dummy_ ## fn
# define FN_NAME(fn) fake_ ## fn
# define INTERPOSE(fn) \
__attribute__((__used__)) static const interpose_t interpose_ ## fn \
__attribute__((__section__("__DATA,__interpose"))) = \
{ (void *)dummy_ ## fn, (void *)fn };
{ (void *)fake_ ## fn, (void *)fn };
#else
# define FN_NAME(fn) fn
# define INTERPOSE(fn)
#endif
/*
* Dummy versions of the exec(3) family of syscalls. It is not enough to
* just dummy out execve(2) since many C libraries do not call the public
* Replacements for the exec(3) family of syscalls. It is not enough to
* just replace execve(2) since many C libraries do not call the public
* execve(2) interface. Note that it is still possible to access the real
* syscalls via the syscall(2) interface, but that is rarely done.
*/
#define DUMMY_BODY \
#define EXEC_REPL_BODY \
{ \
errno = EACCES; \
return -1; \
}
#define DUMMY1(fn, t1) \
#define EXEC_REPL1(fn, t1) \
sudo_dso_public int \
FN_NAME(fn)(t1 a1) \
DUMMY_BODY \
EXEC_REPL_BODY \
INTERPOSE(fn)
#define DUMMY2(fn, t1, t2) \
#define EXEC_REPL2(fn, t1, t2) \
sudo_dso_public int \
FN_NAME(fn)(t1 a1, t2 a2) \
DUMMY_BODY \
EXEC_REPL_BODY \
INTERPOSE(fn)
#define DUMMY3(fn, t1, t2, t3) \
#define EXEC_REPL3(fn, t1, t2, t3) \
sudo_dso_public int \
FN_NAME(fn)(t1 a1, t2 a2, t3 a3) \
DUMMY_BODY \
EXEC_REPL_BODY \
INTERPOSE(fn)
#define DUMMY6(fn, t1, t2, t3, t4, t5, t6) \
#define EXEC_REPL6(fn, t1, t2, t3, t4, t5, t6) \
sudo_dso_public int \
FN_NAME(fn)(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6) \
DUMMY_BODY \
EXEC_REPL_BODY \
INTERPOSE(fn)
#define DUMMY_VA(fn, t1, t2) \
#define EXEC_REPL_VA(fn, t1, t2) \
sudo_dso_public int \
FN_NAME(fn)(t1 a1, t2 a2, ...) \
DUMMY_BODY \
EXEC_REPL_BODY \
INTERPOSE(fn)
/*
* Standard exec(3) family of functions.
*/
DUMMY_VA(execl, const char *, const char *)
DUMMY_VA(execle, const char *, const char *)
DUMMY_VA(execlp, const char *, const char *)
DUMMY2(execv, const char *, char * const *)
DUMMY2(execvp, const char *, char * const *)
DUMMY3(execve, const char *, char * const *, char * const *)
EXEC_REPL_VA(execl, const char *, const char *)
EXEC_REPL_VA(execle, const char *, const char *)
EXEC_REPL_VA(execlp, const char *, const char *)
EXEC_REPL2(execv, const char *, char * const *)
EXEC_REPL2(execvp, const char *, char * const *)
EXEC_REPL3(execve, const char *, char * const *, char * const *)
/*
* Non-standard exec(3) functions and corresponding private versions.
*/
#ifdef HAVE_EXECVP
DUMMY3(execvP, const char *, const char *, char * const *)
EXEC_REPL3(execvP, const char *, const char *, char * const *)
#endif
#ifdef HAVE_EXECVPE
DUMMY3(execvpe, const char *, char * const *, char * const *)
EXEC_REPL3(execvpe, const char *, char * const *, char * const *)
#endif
#ifdef HAVE_EXECT
DUMMY3(exect, const char *, char * const *, char * const *)
EXEC_REPL3(exect, const char *, char * const *, char * const *)
#endif
/*
* Not all systems support fexecve(2), posix_spawn(2) and posix_spawnp(2).
*/
#ifdef HAVE_FEXECVE
DUMMY3(fexecve, int , char * const *, char * const *)
EXEC_REPL3(fexecve, int , char * const *, char * const *)
#endif
#ifdef HAVE_POSIX_SPAWN
DUMMY6(posix_spawn, pid_t *, const char *, const posix_spawn_file_actions_t *, const posix_spawnattr_t *, char * const *, char * const *)
EXEC_REPL6(posix_spawn, pid_t *, const char *, const posix_spawn_file_actions_t *, const posix_spawnattr_t *, char * const *, char * const *)
#endif
#ifdef HAVE_POSIX_SPAWNP
DUMMY6(posix_spawnp, pid_t *, const char *, const posix_spawn_file_actions_t *, const posix_spawnattr_t *, char * const *, char * const *)
EXEC_REPL6(posix_spawnp, pid_t *, const char *, const posix_spawn_file_actions_t *, const posix_spawnattr_t *, char * const *, char * const *)
#endif
/*
* system(3) and popen(3).
* We can't use a wrapper for popen since it returns FILE *, not int.
*/
DUMMY1(system, const char *)
EXEC_REPL1(system, const char *)
sudo_dso_public FILE *
FN_NAME(popen)(const char *c, const char *t)