Mercurial > sdl-ios-xcode
annotate src/audio/SDL_audiodev.c @ 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 | fcfb783a3ca2 |
| children | c9b51268668f |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
|
769
b8d311d90021
Updated copyright information for 2004 (Happy New Year!)
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
3 Copyright (C) 1997-2004 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
| 6 modify it under the terms of the GNU Library General Public | |
| 7 License as published by the Free Software Foundation; either | |
| 8 version 2 of the License, or (at your option) any later version. | |
| 9 | |
| 10 This library is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 Library General Public License for more details. | |
| 14 | |
| 15 You should have received a copy of the GNU Library General Public | |
| 16 License along with this library; if not, write to the Free | |
| 17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 18 | |
| 19 Sam Lantinga | |
|
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
94
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
| 22 | |
| 23 #ifdef SAVE_RCSID | |
| 24 static char rcsid = | |
| 25 "@(#) $Id$"; | |
| 26 #endif | |
| 27 | |
| 28 /* Get the name of the audio device we use for output */ | |
| 29 | |
|
1035
974ba6ae0fa3
Date: Wed, 26 Jan 2005 13:37:09 GMT
Sam Lantinga <slouken@libsdl.org>
parents:
1026
diff
changeset
|
30 #if defined(unix) || defined(__unix__) || defined(__riscos__) |
| 0 | 31 |
| 32 #include <stdlib.h> | |
| 33 #include <stdio.h> | |
| 34 #include <fcntl.h> | |
| 35 #include <sys/types.h> | |
| 36 #include <sys/stat.h> | |
| 37 #include <string.h> | |
| 38 | |
| 39 #include "SDL_audiodev_c.h" | |
| 40 | |
| 41 #ifndef _PATH_DEV_DSP | |
|
1026
0f3aa6ab3341
Select patches included from The NetBSD Package Collection (www.pkgsrc.org)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
42 #if defined(__NetBSD__) || defined(__OpenBSD__) |
|
94
ae6e6b73333f
Cleaned up the OpenBSD port, thanks to Peter Valchev
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
43 #define _PATH_DEV_DSP "/dev/audio" |
|
ae6e6b73333f
Cleaned up the OpenBSD port, thanks to Peter Valchev
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
44 #else |
|
ae6e6b73333f
Cleaned up the OpenBSD port, thanks to Peter Valchev
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
45 #define _PATH_DEV_DSP "/dev/dsp" |
|
ae6e6b73333f
Cleaned up the OpenBSD port, thanks to Peter Valchev
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
46 #endif |
| 0 | 47 #endif |
| 48 #ifndef _PATH_DEV_DSP24 | |
| 49 #define _PATH_DEV_DSP24 "/dev/sound/dsp" | |
| 50 #endif | |
| 51 #ifndef _PATH_DEV_AUDIO | |
| 52 #define _PATH_DEV_AUDIO "/dev/audio" | |
| 53 #endif | |
| 54 | |
| 55 | |
| 56 int SDL_OpenAudioPath(char *path, int maxlen, int flags, int classic) | |
| 57 { | |
| 58 const char *audiodev; | |
| 59 int audio_fd; | |
| 60 char audiopath[1024]; | |
| 61 | |
| 62 /* Figure out what our audio device is */ | |
| 63 if ( ((audiodev=getenv("SDL_PATH_DSP")) == NULL) && | |
| 64 ((audiodev=getenv("AUDIODEV")) == NULL) ) { | |
| 65 if ( classic ) { | |
| 66 audiodev = _PATH_DEV_AUDIO; | |
| 67 } else { | |
| 68 struct stat sb; | |
| 69 | |
| 70 /* Added support for /dev/sound/\* in Linux 2.4 */ | |
|
1138
fcfb783a3ca2
Commercial-OSS-on-Solaris patch...
Ryan C. Gordon <icculus@icculus.org>
parents:
1035
diff
changeset
|
71 if ( ((stat("/dev/sound", &sb) == 0) && S_ISDIR(sb.st_mode)) && |
|
fcfb783a3ca2
Commercial-OSS-on-Solaris patch...
Ryan C. Gordon <icculus@icculus.org>
parents:
1035
diff
changeset
|
72 ((stat(_PATH_DEV_DSP24, &sb) == 0) && S_ISCHR(sb.st_mode)) ) { |
| 0 | 73 audiodev = _PATH_DEV_DSP24; |
| 74 } else { | |
| 75 audiodev = _PATH_DEV_DSP; | |
| 76 } | |
| 77 } | |
| 78 } | |
| 79 audio_fd = open(audiodev, flags, 0); | |
| 80 | |
| 81 /* If the first open fails, look for other devices */ | |
| 82 if ( (audio_fd < 0) && (strlen(audiodev) < (sizeof(audiopath)-3)) ) { | |
| 83 int exists, instance; | |
| 84 struct stat sb; | |
| 85 | |
| 86 instance = 1; | |
| 87 do { /* Don't use errno ENOENT - it may not be thread-safe */ | |
| 88 sprintf(audiopath, "%s%d", audiodev, instance++); | |
| 89 exists = 0; | |
| 90 if ( stat(audiopath, &sb) == 0 ) { | |
| 91 exists = 1; | |
| 92 audio_fd = open(audiopath, flags, 0); | |
| 93 } | |
| 94 } while ( exists && (audio_fd < 0) ); | |
| 95 audiodev = audiopath; | |
| 96 } | |
| 97 if ( path != NULL ) { | |
| 98 strncpy(path, audiodev, maxlen); | |
| 99 path[maxlen-1] = '\0'; | |
| 100 } | |
| 101 return(audio_fd); | |
| 102 } | |
| 103 | |
| 104 #elif defined(_AIX) | |
| 105 | |
| 106 /* Get the name of the audio device we use for output */ | |
| 107 | |
| 108 #include <stdlib.h> | |
| 109 #include <sys/types.h> | |
| 110 #include <sys/stat.h> | |
| 111 #include <string.h> | |
| 112 | |
| 113 #include "SDL_audiodev_c.h" | |
| 114 | |
| 115 #ifndef _PATH_DEV_DSP | |
| 116 #define _PATH_DEV_DSP "/dev/%caud%c/%c" | |
| 117 #endif | |
| 118 | |
| 119 char devsettings[][3] = | |
| 120 { | |
| 121 { 'p', '0', '1' }, { 'p', '0', '2' }, { 'p', '0', '3' }, { 'p', '0', '4' }, | |
| 122 { 'p', '1', '1' }, { 'p', '1', '2' }, { 'p', '1', '3' }, { 'p', '1', '4' }, | |
| 123 { 'p', '2', '1' }, { 'p', '2', '2' }, { 'p', '2', '3' }, { 'p', '2', '4' }, | |
| 124 { 'p', '3', '1' }, { 'p', '3', '2' }, { 'p', '3', '3' }, { 'p', '3', '4' }, | |
| 125 { 'b', '0', '1' }, { 'b', '0', '2' }, { 'b', '0', '3' }, { 'b', '0', '4' }, | |
| 126 { 'b', '1', '1' }, { 'b', '1', '2' }, { 'b', '1', '3' }, { 'b', '1', '4' }, | |
| 127 { 'b', '2', '1' }, { 'b', '2', '2' }, { 'b', '2', '3' }, { 'b', '2', '4' }, | |
| 128 { 'b', '3', '1' }, { 'b', '3', '2' }, { 'b', '3', '3' }, { 'b', '3', '4' }, | |
| 129 { '\0', '\0', '\0' } | |
| 130 }; | |
| 131 | |
| 132 static int OpenUserDefinedDevice(char *path, int maxlen, int flags) | |
| 133 { | |
| 134 const char *audiodev; | |
| 135 int audio_fd; | |
| 136 | |
| 137 /* Figure out what our audio device is */ | |
| 138 if ((audiodev=getenv("SDL_PATH_DSP")) == NULL) { | |
| 139 audiodev=getenv("AUDIODEV"); | |
| 140 } | |
| 141 if ( audiodev == NULL ) { | |
| 142 return -1; | |
| 143 } | |
| 144 audio_fd = open(audiodev, flags, 0); | |
| 145 if ( path != NULL ) { | |
| 146 strncpy(path, audiodev, maxlen); | |
| 147 path[maxlen-1] = '\0'; | |
| 148 } | |
| 149 return audio_fd; | |
| 150 } | |
| 151 | |
| 152 int SDL_OpenAudioPath(char *path, int maxlen, int flags, int classic) | |
| 153 { | |
| 154 struct stat sb; | |
| 155 int audio_fd; | |
| 156 char audiopath[1024]; | |
| 157 int cycle; | |
| 158 | |
| 159 audio_fd = OpenUserDefinedDevice(path,maxlen,flags); | |
| 160 if ( audio_fd != -1 ) { | |
| 161 return audio_fd; | |
| 162 } | |
| 163 | |
| 164 cycle = 0; | |
| 165 while( devsettings[cycle][0] != '\0' ) { | |
| 166 sprintf( audiopath, | |
| 167 _PATH_DEV_DSP, | |
| 168 devsettings[cycle][0], | |
| 169 devsettings[cycle][1], | |
| 170 devsettings[cycle][2]); | |
| 171 | |
| 172 if ( stat(audiopath, &sb) == 0 ) { | |
| 173 audio_fd = open(audiopath, flags, 0); | |
| 174 if ( audio_fd > 0 ) { | |
| 175 if ( path != NULL ) { | |
| 176 strncpy( path, audiopath, maxlen ); | |
| 177 path[maxlen-1] = '\0'; | |
| 178 } | |
| 179 return audio_fd; | |
| 180 } | |
| 181 } | |
| 182 } | |
| 183 return -1; | |
| 184 } | |
| 185 | |
| 186 #endif /* UNIX system */ |