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

Merge "Use the MAX_ERRNO constant."

Browse Source
This commit is contained in:
Elliott Hughes 2014-01-03 00:24:45 +00:00 committed by Gerrit Code Review
commit 3b36564b18
2 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libc/arch-x86/bionic/syscall.S
View File

@ -10,8 +10,7 @@
* %ebp: arg5 - callee save * %ebp: arg5 - callee save
*/ */
#include <asm/unistd.h> #include <private/bionic_asm.h>
#include <machine/asm.h>
ENTRY(syscall) ENTRY(syscall)
# Push the callee save registers. # Push the callee save registers.
@ -34,7 +33,7 @@ ENTRY(syscall)
int $0x80 int $0x80
# Error? # Error?
cmpl $-4095, %eax cmpl $-MAX_ERRNO, %eax
jb 1f jb 1f
# Yes, so set errno. # Yes, so set errno.
negl %eax negl %eax

57
libc/arch-x86/bionic/vfork.S
View File

@ -1,22 +1,45 @@
#include <machine/asm.h> /*
#include <asm/unistd.h> * Copyright (C) 2008 The Android Open Source Project
* All rights reserved.
/* Get rid of the stack modifications (popl/ret) after vfork() success. *
* vfork is VERY sneaky. One has to be very careful about what can be done * Redistribution and use in source and binary forms, with or without
* between a successful vfork and a a subsequent execve() * modification, are permitted provided that the following conditions
* are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/ */
#include <private/bionic_asm.h>
// This custom code preserves the return address across the system call.
ENTRY(vfork) ENTRY(vfork)
/* grab the return address */ popl %ecx // Grab the return address.
popl %ecx movl $__NR_vfork, %eax
movl $__NR_vfork, %eax int $0x80
int $0x80 cmpl $-MAX_ERRNO, %eax
cmpl $-129, %eax jb 1f
jb 1f negl %eax
negl %eax pushl %eax
pushl %eax call __set_errno
call __set_errno orl $-1, %eax
orl $-1, %eax
1: 1:
jmp *%ecx jmp *%ecx // Jump to the stored return address.
END(vfork) END(vfork)