diff options
Diffstat (limited to 'main/open-vm-tools-grsec/vmci_driver_c.patch')
| -rw-r--r-- | main/open-vm-tools-grsec/vmci_driver_c.patch | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/main/open-vm-tools-grsec/vmci_driver_c.patch b/main/open-vm-tools-grsec/vmci_driver_c.patch index 67faea5513..95450d13b6 100644 --- a/main/open-vm-tools-grsec/vmci_driver_c.patch +++ b/main/open-vm-tools-grsec/vmci_driver_c.patch @@ -1,36 +1,33 @@ -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 @@ +--- ./modules/linux/vmci/linux/driver.c.orig ++++ ./modules/linux/vmci/linux/driver.c +@@ -252,7 +252,21 @@ #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. -+ */ ++/* initilaize here to make constify plugin happy */ +static struct file_operations vmuser_fops = { -+ .owner = THIS_MODULE, -+ .poll = LinuxDriverPoll, ++ .owner = THIS_MODULE, ++ .poll = LinuxDriverPoll, +#ifdef HAVE_UNLOCKED_IOCTL -+ .unlocked_ioctl = LinuxDriver_UnlockedIoctl, ++ .unlocked_ioctl = LinuxDriver_UnlockedIoctl, +#else -+ .ioctl = LinuxDriver_Ioctl, ++ .ioctl = LinuxDriver_Ioctl, +#endif +#ifdef HAVE_COMPAT_IOCTL -+ .compat_ioctl = LinuxDriver_UnlockedIoctl, ++ .compat_ioctl = LinuxDriver_UnlockedIoctl, +#endif -+ .open = LinuxDriver_Open, -+ .release = LinuxDriver_Close ++ .open = LinuxDriver_Open, ++ .release = LinuxDriver_Close +}; /* -@@ -378,26 +395,6 @@ +@@ -388,26 +402,6 @@ + if (VMCI_HostInit() < VMCI_SUCCESS) { 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 @@ -50,7 +47,6 @@ diff -Naur open-vm-tools-2011.09.23-491607-before/modules/linux/vmci/linux/drive -#endif - vmuser_fops.open = LinuxDriver_Open; - vmuser_fops.release = LinuxDriver_Close; -- + sprintf(linuxState.deviceName, "vmci"); linuxState.major = 10; - linuxState.misc.minor = MISC_DYNAMIC_MINOR; |