aboutsummaryrefslogtreecommitdiffstats
path: root/main/open-vm-tools-grsec/vmci_driver_c.patch
blob: 95450d13b6979dac1e9f211a5e023ea8b89e74a9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
--- ./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;
+/* initilaize here to make constify plugin happy */
+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
+};
 
 
 /*
@@ -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
-    * 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;