generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 7dd126a3: Merge "Clean up some misinformation around prctl."

Browse Source 
* commit '7dd126a38ca501818b07927f310dcc0f531c0f1f':
  Clean up some misinformation around prctl.
This commit is contained in:
Elliott Hughes 2014-07-18 23:35:08 +00:00 committed by Android Git Automerger
commit 2199ac3113
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libc/SYSCALLS.TXT
View File

@ -80,9 +80,7 @@ int setpgid(pid_t, pid_t) all
int setregid:setregid32(gid_t, gid_t) arm,x86 int setregid:setregid32(gid_t, gid_t) arm,x86
int setregid:setregid(gid_t, gid_t) arm64,mips,mips64,x86_64 int setregid:setregid(gid_t, gid_t) arm64,mips,mips64,x86_64
int chroot(const char*) all int chroot(const char*) all
# IMPORTANT: Even though <sys/prctl.h> declares prctl(int, ...), the syscall stub must take 6 arguments int prctl(int, unsigned long, unsigned long, unsigned long, unsigned long) all
# to match the kernel implementation.
int prctl(int option, unsigned int arg2, unsigned int arg3, unsigned int arg4, unsigned int arg5) all
long __arch_prctl:arch_prctl(int, unsigned long) x86_64 long __arch_prctl:arch_prctl(int, unsigned long) x86_64
int capget(cap_user_header_t header, cap_user_data_t data) all int capget(cap_user_header_t header, cap_user_data_t data) all
int capset(cap_user_header_t header, const cap_user_data_t data) all int capset(cap_user_header_t header, const cap_user_data_t data) all

10
libc/include/sys/prctl.h
View File

@ -25,20 +25,16 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#ifndef _SYS_PRCTL_H #ifndef _SYS_PRCTL_H
#define _SYS_PRCTL_H #define _SYS_PRCTL_H
#include <linux/prctl.h>
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <linux/prctl.h>
__BEGIN_DECLS __BEGIN_DECLS
/* IMPORTANT NOTE: This function is declared as taking a variable number
* of arguments to match the GLibc definition. However
* its declaration inside SYSCALLS.TXT *must* make it
* take 6 arguments to ensure consistency with the kernel
* implementation.
*/
extern int prctl(int option, ...); extern int prctl(int option, ...);
__END_DECLS __END_DECLS

3
libc/include/unistd.h
View File

@ -71,9 +71,6 @@ extern int execl(const char *, const char *, ...);
extern int execlp(const char *, const char *, ...); extern int execlp(const char *, const char *, ...);
extern int execle(const char *, const char *, ...); extern int execle(const char *, const char *, ...);
/* IMPORTANT: See comment under <sys/prctl.h> about this declaration */
extern int prctl(int option, ...);
extern int nice(int); extern int nice(int);
extern int setuid(uid_t); extern int setuid(uid_t);