diff -u fglrx-installer-8.723.1/debian/dkms.conf.in fglrx-installer-8.723.1/debian/dkms.conf.in --- fglrx-installer-8.723.1/debian/dkms.conf.in +++ fglrx-installer-8.723.1/debian/dkms.conf.in @@ -11,0 +12 @@ +PATCH[2]="fix_alloc_user_space32.patch" diff -u fglrx-installer-8.723.1/debian/changelog fglrx-installer-8.723.1/debian/changelog --- fglrx-installer-8.723.1/debian/changelog +++ fglrx-installer-8.723.1/debian/changelog @@ -1,3 +1,11 @@ +fglrx-installer (2:8.723.1-0ubuntu5) lucid-proposed; urgency=low + + * Patch KCL_IOCTL_AllocUserSpace32 to work around + compat_alloc_user_space being newly GPL-only. This was causing a FTBFS + on kernels with the fix for CVE-2010-3081 (LP: #642518). + + -- Evan Broder Sat, 18 Sep 2010 22:51:51 -0700 + fglrx-installer (2:8.723.1-0ubuntu4) lucid-proposed; urgency=low * Remove /etc/ati only after calling the fglrx-uninstall.sh only in patch2: unchanged: --- fglrx-installer-8.723.1.orig/debian/dkms/patches/fix_alloc_user_space32.patch +++ fglrx-installer-8.723.1/debian/dkms/patches/fix_alloc_user_space32.patch @@ -0,0 +1,20 @@ +--- a/kcl_ioctl.c 2010-09-18 23:36:34.183148540 -0700 ++++ b/kcl_ioctl.c 2010-09-18 23:38:23.043412880 -0700 +@@ -193,7 +193,16 @@ + */ + void* ATI_API_CALL KCL_IOCTL_AllocUserSpace32(long size) + { +- return compat_alloc_user_space(size); ++ void __user *space; ++ ++ space = arch_compat_alloc_user_space(size); ++ ++ /* Avoid CVE-2010-3081 by checking access_ok ourselves */ ++ if (!access_ok(VERIFY_WRITE, space, size)) { ++ return NULL; ++ } ++ ++ return space; + } + + #endif // __x86_64__