diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2011-10-26 10:48:18 +0000 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2011-10-26 10:50:47 +0000 |
| commit | fa226c3ed1292d395332fa2af851fe2f7f9173cf (patch) | |
| tree | 87b74ed60f037c1176dc92c66139d226c42b2aaa /main/open-vm-tools-grsec/vmci_driver_c.patch | |
| parent | 9badcafb35e02b6d67fb39a9500424834d1589d9 (diff) | |
| download | aports-fa226c3ed1292d395332fa2af851fe2f7f9173cf.tar.bz2 aports-fa226c3ed1292d395332fa2af851fe2f7f9173cf.tar.xz | |
main/open-vm-tools-grsec: upgrade to 2011.09.23
patch vmci driver
https://bugs.gentoo.org/show_bug.cgi?id=386721
Diffstat (limited to 'main/open-vm-tools-grsec/vmci_driver_c.patch')
| -rw-r--r-- | main/open-vm-tools-grsec/vmci_driver_c.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/main/open-vm-tools-grsec/vmci_driver_c.patch b/main/open-vm-tools-grsec/vmci_driver_c.patch new file mode 100644 index 0000000000..67faea5513 --- /dev/null +++ b/main/open-vm-tools-grsec/vmci_driver_c.patch @@ -0,0 +1,56 @@ +diff -Naur open-vm-tools-2011.09.23-491607-before/modules/linux/vmci/linux/driver.c open-vm-tools-2011.09.23-491607-after/modules/linux/vmci/linux/driver.c +--- open-vm-tools-2011.09.23-491607-before/modules/linux/vmci/linux/driver.c 2011-09-26 15:16:30.000000000 -0500 ++++ open-vm-tools-2011.09.23-491607-after/modules/linux/vmci/linux/driver.c 2011-10-13 15:13:19.266661488 -0500 +@@ -241,7 +241,24 @@ + #define LinuxDriverUnlockIoctlPerFD(mutex) do {} while (0) + #endif + +-static struct file_operations vmuser_fops; ++/* ++ * Moved file operations initialize here because of incompatibilites ++ * with Gentoo hardened profile/hardend Linux 3. ++ */ ++static struct file_operations vmuser_fops = { ++ .owner = THIS_MODULE, ++ .poll = LinuxDriverPoll, ++#ifdef HAVE_UNLOCKED_IOCTL ++ .unlocked_ioctl = LinuxDriver_UnlockedIoctl, ++#else ++ .ioctl = LinuxDriver_Ioctl, ++#endif ++#ifdef HAVE_COMPAT_IOCTL ++ .compat_ioctl = LinuxDriver_UnlockedIoctl, ++#endif ++ .open = LinuxDriver_Open, ++ .release = LinuxDriver_Close ++}; + + + /* +@@ -378,26 +395,6 @@ + return -ENOMEM; + } + +- /* +- * Initialize the file_operations structure. Because this code is always +- * compiled as a module, this is fine to do it here and not in a static +- * initializer. +- */ +- +- memset(&vmuser_fops, 0, sizeof vmuser_fops); +- vmuser_fops.owner = THIS_MODULE; +- vmuser_fops.poll = LinuxDriverPoll; +-#ifdef HAVE_UNLOCKED_IOCTL +- vmuser_fops.unlocked_ioctl = LinuxDriver_UnlockedIoctl; +-#else +- vmuser_fops.ioctl = LinuxDriver_Ioctl; +-#endif +-#ifdef HAVE_COMPAT_IOCTL +- vmuser_fops.compat_ioctl = LinuxDriver_UnlockedIoctl; +-#endif +- vmuser_fops.open = LinuxDriver_Open; +- vmuser_fops.release = LinuxDriver_Close; +- + sprintf(linuxState.deviceName, "vmci"); + linuxState.major = 10; + linuxState.misc.minor = MISC_DYNAMIC_MINOR; |