Mercurial > sdl-ios-xcode
view src/thread/linux/clone.S @ 1176:dd2a8deeb26d
Date: Mon, 17 Oct 2005 20:09:03 -0400
From: Mark Schreiber <mark7@alumni.cmu.edu>
To: ryan@clutteredmind.org
Subject: [PATCH]SDL mprotect() crash fix
(I'm going to throw this patch your way at the suggestion of #SDL --
for some reason, I had some difficulty sending it to the main list
last time, and I go bonkers subscribing to send each email or
patch...)
Currently, when I run SDL applications as non-root using
SDL_VIDEODRIVER=dga, the fbdev fallback mprotect()s read/write the
proper size of mmapped /dev/fb0 (7.5MB), but on framebuffer release
mprotect()s read-only the range by the entire size of my video memory
(128MB), which causes a segfault:
#0 0x002a9a27 in ?? () from /lib/libc.so.6
#1 0x04a63eb6 in SDL_XDGAUnmapFramebuffer (screen=3D0) at XF86DGA2.c:978
#2 0x04a63efc in SDL_XDGACloseFramebuffer (dpy=3D0x9d3f008, screen=3D0)
at XF86DGA2.c:268
#3 0x04a68b57 in DGA_Available () at SDL_dgavideo.c:98
#4 0x04a53677 in SDL_VideoInit (driver_name=3D0xbfb0bfc7 "dga", flags=3D0)
at SDL_video.c:180
#5 0x04a2613f in SDL_InitSubSystem (flags=3D32) at SDL.c:74
#6 0x04a2617c in SDL_Init (flags=3D32) at SDL.c:166
#7 0x08049722 in main (argc=3D1, argv=3D0x0) at testwin.c:32
This is SDL 1.2.8 on Fedora Core 4, radeon driver for a Radeon 9250,
xorg-x11-6.8.2-37.
I've attached a one-line patch against SDL CVS that updates the size
of the framebuffer at framebuffer map time so that the mprotect() on
unmap will be the same size. I'm not sure if this is the best
approach (i.e. one might want to retain the original value), but it
does make my SDL applications work without segfaulting.
-- Best of luck, Mark Schreiber
author | Ryan C. Gordon <icculus@icculus.org> |
---|---|
date | Sat, 19 Nov 2005 18:57:00 +0000 |
parents | 974ba6ae0fa3 |
children | c9b51268668f |
line wrap: on
line source
/* Taken with thanks from LinuxThreads 0.6 */ /* This is no longer necessary with glibc-2.1, which has its own clone() */ #ifdef linux /* Look to see if glibc is available, and if so, what version */ #include <features.h> #if (__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 1)) #define HAVE_CLONE #endif /* glibc 2.1 or newer */ #endif /* linux */ #if defined(linux) && !defined(SDL_USE_PTHREADS) && !defined(HAVE_CLONE) #if defined(__i386__) /************************************************************************/ /* Copyright (C) 1996, 1997 Free Software Foundation, Inc. Contributed by Richard Henderson (rth@tamu.edu) The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. The GNU C Library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, #ifdef SAVE_RCSID static char rcsid = "@(#) $Id$"; #endif Cambridge, MA 02139, USA. */ /* clone() is even more special than fork() as it mucks with stacks and invokes a function in the right context after its all over. */ #include <asm/errno.h> #include <asm/unistd.h> /* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg); */ .text .align 4 .globl __clone .type __clone,@function .weak clone clone = __clone __clone: /* Sanity check arguments. */ movl $-EINVAL,%eax movl 4(%esp),%ecx /* no NULL function pointers */ testl %ecx,%ecx jz syscall_error movl 8(%esp),%ecx /* no NULL stack pointers */ testl %ecx,%ecx jz syscall_error /* Insert the argument onto the new stack. */ subl $8,%ecx movl 16(%esp),%eax movl %eax,4(%ecx) /* Save the function pointer as the zeroth argument. */ /* It will be popped off in the child in the ebx frobbing below. */ movl 4(%esp),%eax movl %eax,0(%ecx) /* Do the system call */ pushl %ebx movl 16(%esp),%ebx movl $__NR_clone,%eax int $0x80 popl %ebx test %eax,%eax jl syscall_error jz thread_start ret syscall_error: negl %eax pushl %eax #ifdef __PIC__ call __errno_location@PLT #else call __errno_location #endif popl 0(%eax) movl $-1, %eax ret thread_start: subl %ebp,%ebp /* terminate the stack frame */ call *%ebx pushl %eax #ifdef __PIC__ call _exit@PLT #else call _exit #endif /************************************************************************/ #elif defined(sparc) /************************************************************************/ /* Copyright (C) 1996, 1997 Free Software Foundation, Inc. Contributed by Miguel de Icaza (miguel@nuclecu.unam.mx) Based on code written for the Intel by Richard Henderson (rth@tamu.edu) The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. The GNU C Library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* clone() is even more special than fork() as it mucks with stacks and invokes a function in the right context after its all over. */ #include <asm/errno.h> #include <asm/unistd.h> /* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg); */ .text .align 4 .globl __clone .type __clone,@function .weak clone clone = __clone __clone: save %sp,-96,%sp /* sanity check arguments */ tst %i0 be __clone_syscall_error tst %i1 be __clone_syscall_error nop /* Do the system call */ mov %i1,%o1 mov %i2,%o0 set __NR_clone,%g1 ta 0x10 bcs __clone_syscall_error tst %o1 bne __thread_start nop mov %o0,%i0 ret restore __clone_syscall_error: call __errno_location set EINVAL,%i0 st %i0,[%o0] mov -1,%i0 ret restore __thread_start: call %i0 mov %i3,%o0 call _exit,0 nop /************************************************************************/ #else #error "Unknown Linux architecture" #endif #endif /* Linux && ! SDL_USE_PTHREADS */