VMCI: adjust to craziness of grsecurity patches

Apparently grsecurity patchset redefines struct file_operations
as read only so we need to use static initializers.

Also did some additional cleanup in module initialization.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>

diff --git a/open-vm-tools/modules/linux/vmci/linux/driver.c b/open-vm-tools/modules/linux/vmci/linux/driver.c
index f2a8f297a529182d8fd220229ee9c1c6df66185b..c27d0682f86f773679f319c5dda953b1435d58ef 100644 (file)
--- a/open-vm-tools/modules/linux/vmci/linux/driver.c
+++ b/open-vm-tools/modules/linux/vmci/linux/driver.c
@@ -80,6 +80,10 @@ sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg);
 
 #define LGPFX "VMCI: "
 
+#define VMCI_DEVICE_NAME   "vmci"
+#define VMCI_MODULE_NAME   "vmci"
+
+
 /*
  *----------------------------------------------------------------------
  *
@@ -121,7 +125,7 @@ static int vmci_probe_device(struct pci_dev *pdev,
 static void vmci_remove_device(struct pci_dev* pdev);
 
 static struct pci_driver vmci_driver = {
-   .name     = "vmci",
+   .name     = VMCI_DEVICE_NAME,
    .id_table = vmci_ids,
    .probe = vmci_probe_device,
    .remove = __devexit_p(vmci_remove_device),
@@ -206,16 +210,11 @@ typedef struct VMCILinux {
 #define LINUXLOG_BUFFER_SIZE  1024
 
 typedef struct VMCILinuxState {
-   int major;
-   int minor;
    struct miscdevice misc;
-   char deviceName[VM_DEVICE_NAME_SIZE];
    char buf[LINUXLOG_BUFFER_SIZE];
    atomic_t activeContexts;
 } VMCILinuxState;
 
-static struct VMCILinuxState linuxState;
-
 static int VMCISetupNotify(VMCIContext *context, VA notifyUVA);
 static void VMCIUnsetNotifyInt(VMCIContext *context, Bool useLock);
 
@@ -241,7 +240,30 @@ static unsigned int LinuxDriverPoll(struct file *file, poll_table *wait);
 #define LinuxDriverUnlockIoctlPerFD(mutex) do {} while (0)
 #endif
 
-static struct file_operations vmuser_fops;
+/* should be const if not for older kernels support */
+static struct file_operations vmuser_fops = {
+   .owner            = THIS_MODULE,
+   .open             = LinuxDriver_Open,
+   .release          = LinuxDriver_Close,
+   .poll             = LinuxDriverPoll,
+#ifdef HAVE_UNLOCKED_IOCTL
+   .unlocked_ioctl   = LinuxDriver_UnlockedIoctl,
+#else
+   .ioctl            = LinuxDriver_Ioctl,
+#endif
+#ifdef HAVE_COMPAT_IOCTL
+   .compat_ioctl     = LinuxDriver_UnlockedIoctl,
+#endif
+};
+
+static struct VMCILinuxState linuxState = {
+   .misc             = {
+      .name          = VMCI_DEVICE_NAME,
+      .minor         = MISC_DYNAMIC_MINOR,
+      .fops          = &vmuser_fops,
+   },
+   .activeContexts   = ATOMIC_INIT(0),
+};
 
 
 /*
@@ -369,65 +391,40 @@ unregister_ioctl32_handlers(void)
  *-----------------------------------------------------------------------------
  */
 
-int
+static int
 vmci_host_init(void)
 {
-   int retval;
+   int error;
 
    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;
-   linuxState.misc.minor = MISC_DYNAMIC_MINOR;
-   linuxState.misc.name = linuxState.deviceName;
-   linuxState.misc.fops = &vmuser_fops;
-   atomic_set(&linuxState.activeContexts, 0);
-
-   retval = misc_register(&linuxState.misc);
-
-   if (retval) {
-      Warning(LGPFX"Module registration error "
-              "(name=%s,major=%d,minor=%d,err=%d).\n",
-              linuxState.deviceName, -retval, linuxState.major,
-              linuxState.minor);
-      goto exit;
+   error = misc_register(&linuxState.misc);
+   if (error) {
+      Warning(LGPFX "Module registration error "
+              "(name=%s, major=%d, minor=%d, err=%d).\n",
+              linuxState.misc.name, MISC_MAJOR, linuxState.misc.minor,
+              error);
+      goto err_host_cleanup;
    }
-   linuxState.minor = linuxState.misc.minor;
-   Log(LGPFX"Module registered (name=%s,major=%d,minor=%d).\n",
-       linuxState.deviceName, linuxState.major, linuxState.minor);
 
-   retval = register_ioctl32_handlers();
-   if (retval) {
-      misc_deregister(&linuxState.misc);
+   error = register_ioctl32_handlers();
+   if (error) {
+      Warning(LGPFX "Failed to register ioctl32 handlers, err: %d\n", error);
+      goto err_misc_unregister;
    }
 
-exit:
-   if (retval) {
-      VMCI_HostCleanup();
-   }
-   return retval;
+   Log(LGPFX "Module registered (name=%s, major=%d, minor=%d).\n",
+       linuxState.misc.name, MISC_MAJOR, linuxState.misc.minor);
+
+   return 0;
+
+err_misc_unregister:
+   misc_deregister(&linuxState.misc);
+err_host_cleanup:
+   VMCI_HostCleanup();
+   return error;
 }
 
 
@@ -2409,29 +2406,25 @@ vmci_init(void)
       return -ENOMEM;
    }
 
-   if (vmci_disable_guest) {
-      guestDeviceInit = 0;
-   } else {
+   if (!vmci_disable_guest) {
       retval = vmci_guest_init();
       if (retval != 0) {
          Warning(LGPFX"VMCI PCI device not initialized (err=%d).\n", retval);
-      }
-      guestDeviceInit = (retval == 0);
-      if (VMCI_GuestPersonalityActive()) {
-         Log(LGPFX"Using guest personality\n");
+      } else {
+         guestDeviceInit = TRUE;
+         if (VMCI_GuestPersonalityActive()) {
+            Log(LGPFX"Using guest personality\n");
+         }
       }
    }
 
-   if (vmci_disable_host) {
-      hostDeviceInit = 0;
-   } else {
+   if (!vmci_disable_host) {
       retval = vmci_host_init();
       if (retval != 0) {
          Warning(LGPFX"Unable to initialize host personality (err=%d).\n",
                  retval);
-      }
-      hostDeviceInit = (retval == 0);
-      if (hostDeviceInit) {
+      } else {
+         hostDeviceInit = TRUE;
          Log(LGPFX"Using host personality\n");
       }
    }
@@ -2441,7 +2434,7 @@ vmci_init(void)
       return -ENODEV;
    }
 
-   Log(LGPFX"Module (name=%s) is initialized\n", linuxState.deviceName);
+   Log(LGPFX"Module (name=%s) is initialized\n", VMCI_MODULE_NAME);
 
    return 0;
 }
@@ -2476,10 +2469,9 @@ vmci_exit(void)
 
       retval = misc_deregister(&linuxState.misc);
       if (retval) {
-         Warning(LGPFX"Module %s: error unregistering\n",
-                 linuxState.deviceName);
+         Warning(LGPFX "Module %s: error unregistering\n", VMCI_MODULE_NAME);
       } else {
-         Log(LGPFX"Module %s: unloaded\n", linuxState.deviceName);
+         Log(LGPFX"Module %s: unloaded\n", VMCI_MODULE_NAME);
       }
 
       hostDeviceInit = FALSE;