[Pkg-fglrx-devel] r493 - in fglrx-driver/trunk/debian: . patches

[Patrick Matthäi]

Author: pmatthaei
Date: 2010-10-24 11:13:09 +0000 (Sun, 24 Oct 2010)
New Revision: 493

Removed:
   fglrx-driver/trunk/debian/patches/04-dkms-compat_alloc_user_space-rename.patch
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/series
Log:
* New upstream release.
  - Remove merged patch 04-dkms-compat_alloc_user_space-rename.


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2010-10-22 15:48:25 UTC (rev 492)
+++ fglrx-driver/trunk/debian/changelog	2010-10-24 11:13:09 UTC (rev 493)
@@ -1,3 +1,10 @@
+fglrx-driver (1:10-10-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    - Remove merged patch 04-dkms-compat_alloc_user_space-rename.
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Sun, 24 Oct 2010 13:07:38 +0200
+
 fglrx-driver (1:10-9-3) unstable; urgency=high
 
   * Avoid attempting to build dkms modules for virtual linux-image packages

Deleted: fglrx-driver/trunk/debian/patches/04-dkms-compat_alloc_user_space-rename.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/04-dkms-compat_alloc_user_space-rename.patch	2010-10-22 15:48:25 UTC (rev 492)
+++ fglrx-driver/trunk/debian/patches/04-dkms-compat_alloc_user_space-rename.patch	2010-10-24 11:13:09 UTC (rev 493)
@@ -1,39 +0,0 @@
-Description: Use arch_compat_alloc_user_space in place of the now unavailable
-     comat_alloc_user_space function in newer kernels.
-Author: Michael Gilbert <michael.s.gilbert at gmail.com>
-Bug-Debian: http://bugs.debian.org/597478
-Index: fglrx-driver-10-9/common/lib/modules/fglrx/build_mod/kcl_ioctl.c
-===================================================================
---- fglrx-driver-10-9.orig/common/lib/modules/fglrx/build_mod/kcl_ioctl.c	2010-09-21 00:59:36.000000000 -0400
-+++ fglrx-driver-10-9/common/lib/modules/fglrx/build_mod/kcl_ioctl.c	2010-09-21 01:01:42.000000000 -0400
-@@ -193,7 +193,17 @@
-  */
- void* ATI_API_CALL KCL_IOCTL_AllocUserSpace32(long size)
- {
--    return compat_alloc_user_space(size);
-+    void __user *space;
-+#if ARCH_COMPAT_ALLOC_USER_SPACE
-+    space = arch_compat_alloc_user_space(size);
-+#else
-+    space = compat_alloc_user_space(size);
-+#endif
-+    // avoid cve-2010-3081
-+    if (!access_ok(VERIFY_WRITE, space, size)) {
-+        return NULL;
-+    }
-+    return space;
- }
- 
- #endif // __x86_64__
-Index: fglrx-driver-10-9/common/lib/modules/fglrx/build_mod/2.6.x/Makefile
-===================================================================
---- fglrx-driver-10-9.orig/common/lib/modules/fglrx/build_mod/2.6.x/Makefile	2010-09-21 00:59:27.000000000 -0400
-+++ fglrx-driver-10-9/common/lib/modules/fglrx/build_mod/2.6.x/Makefile	2010-09-22 21:43:54.000000000 -0400
-@@ -66,6 +66,7 @@
-                 -DFGL_GART_RESERVED_SLOT \
-                 -DFGL_LINUX253P1_VMA_API \
-                 -DPAGE_ATTR_FIX=$(PAGE_ATTR_FIX) \
-+                -DARCH_COMPAT_ALLOC_USER_SPACE=$(shell if grep -q compat_alloc_user_space /lib/modules/$(KERNELRELEASE)/build/Module.symvers ; then echo 1 ; else echo 0 ; fi) \
- 
- ifeq ($(KERNELRELEASE),)
- # on first call from remote location we get into this path

Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series	2010-10-22 15:48:25 UTC (rev 492)
+++ fglrx-driver/trunk/debian/patches/series	2010-10-24 11:13:09 UTC (rev 493)
@@ -1,3 +1,2 @@
 01-CONFIG_X86_XEN.diff
 03-authatieventsd.sh.diff
-04-dkms-compat_alloc_user_space-rename.patch