view Makefile.am @ 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 e044e7c70a50
children e05bc5d315e3
line wrap: on
line source

# The top-level input Makefile for SDL

# require automake 1.4
AUTOMAKE_OPTIONS = 1.4

## Any directories that you want built and installed should go here.
SUBDIRS = src include docs

## Any directories you want a part of the distribution should be listed
## here, as well as have a Makefile generated at the end of configure.in
##
## This only works for subdirectories one level deep.
DIST_SUBDIRS = $(SUBDIRS)

# SDL runtime configuration script
bin_SCRIPTS = sdl-config

# All the rest of the distributed files
EXTRA_DIST =		\
	BUGS		\
	TODO		\
	COPYING		\
	CREDITS		\
	INSTALL		\
	README		\
	README.AmigaOS	\
	README.CVS	\
	README.DC	\
	README.Epoc	\
	README.MacOS	\
	README.MacOSX	\
	README.MiNT	\
	README.NanoX	\
	README.PicoGUI	\
	README.QNX	\
	README.Qtopia	\
	README.WinCE	\
	README-SDL.txt	\
	Borland.html	\
	Borland.zip	\
	VisualC.html	\
	VisualC.zip	\
	VisualCE.zip	\
	Makefile.dc	\
	MPWmake.sea.bin	\
	CWprojects.sea.bin \
	PBProjects.tar.gz \
	EpocBuildFiles.zip \
	Xcode.tar.gz	\
	Xcode21.tar.gz	\
	WhatsNew	\
	docs.html	\
	sdl.m4		\
	SDL.spec	\
	autogen.sh	\
	strip_fPIC.sh

# M4 macro file for inclusion with autoconf
m4datadir = $(datadir)/aclocal
m4data_DATA = sdl.m4

# Rule to build tar-gzipped distribution package
$(PACKAGE)-$(VERSION).tar.gz: dist

# Rule to build RPM distribution package
rpm: $(PACKAGE)-$(VERSION).tar.gz
	rpm -ta $(PACKAGE)-$(VERSION).tar.gz

# Rule to rebuild the export lists for BeOS, MacOS and Win32.
exports:
	(cd src/main/beos/exports; $(MAKE))
	(cd src/main/macos/exports; $(MAKE))
	(cd src/main/macosx/exports; $(MAKE))
	(cd src/main/win32/exports; $(MAKE))

# Rule to build the Project Builder archive in MacOS X
PBProjects.tar.gz:
	rm -f `find . -name .DS_Store`
	if [ -d PBProjects ]; then \
	    tar zcvf $@ PBProjects; \
	fi

# Rule to install the libraries only - prevent rebuilding apps
install-lib:
	cd src && $(MAKE) install-libLTLIBRARIES

# Run ldconfig after installing the library:
install-hook:
	-ldconfig

# Grab the test programs for the distribution:
dist-hook:
	if test -f test/Makefile; then (cd test; make distclean); fi
	rm -rf $(srcdir)/test/autom4te*
	cp -rp $(srcdir)/test $(distdir)
	rm -rf `find $(distdir) -type d -name CVS -print`

# Create a CVS snapshot that people can run update -d on
CVSROOT = :pserver:guest@libsdl.org:/home/sdlweb/libsdl.org/cvs
snapshot:
	cvs -d $(CVSROOT) login
	cvs -d $(CVSROOT) checkout SDL12
	(cd SDL12 && ./autogen.sh && rm -rf autom4te.cache)
	mv SDL12 SDL-1.2
	tar zcvf $(HOME)/SDL-1.2.tar.gz SDL-1.2
	rm -rf SDL-1.2
snapshot13:
	cvs -d $(CVSROOT) login
	cvs -d $(CVSROOT) checkout -r branch_1_3_x SDL12
	(cd SDL12 && ./autogen.sh && rm -rf autom4te.cache)
	mv SDL12 SDL-1.3
	tar zcvf $(HOME)/SDL-1.3.tar.gz SDL-1.3
	rm -rf SDL-1.3