← Back to branch summary

~ubuntu-branches/ubuntu/quantal/open-vm-tools/quantal-201210021442

« back to all changes in this revision

Viewing changes to modules/linux/vsock/linux/vsockAddr.c

  • Committer: Bazaar Package Importer
  • Author(s): Serge Hallyn
  • Date: 2011-03-31 14:20:05 UTC
  • mfrom: (1.4.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20110331142005-3n9red91p7ogkweo
Tags: 2011.03.28-387002-0ubuntu1
https://launchpad.net/bugs/727342
https://launchpad.net/bugs/332323
https://launchpad.net/bugs/332323
* Merge latest upstream git tag.  This has the unlocked_ioctl change
  needed to fix dkms build failures (LP: #727342)
* Changes in debian/rules:
  - work around a bug in toolbox/Makefile, where install-exec-hook is
    not happening.  This needs to get fixed the right way.
  - don't install 'vmware-user' which seems to no longer exist
  - move /etc/xdg into open-vm-toolbox (which should be done using .install)
* debian/open-vm-tools.init: add 'modprobe [-r] vmblock'. (LP: #332323)
* debian/rules and debian/open-vm-toolbox.lintian-overrides:
  - Make vmware-user-suid-wrapper suid-root (LP: #332323)

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/linux/vsock/linux/vsockAddr.c
103
103
{
104
104
   ASSERT(addr);
105
105
   memset(addr, 0, sizeof *addr);
 
106
 
 
107
#if defined(__APPLE__)
 
108
   addr->svm_len = sizeof *addr;
 
109
#endif
 
110
 
106
111
   addr->svm_cid = cid;
107
112
   addr->svm_port = port;
108
113
   VSOCK_ADDR_NOFAMILY_ASSERT(addr);
441
446
                             uint32 rid)  // IN
442
447
{
443
448
   if (cid == VMCI_HYPERVISOR_CONTEXT_ID) {
444
 
      return FALSE;
 
449
      /*
 
450
       * Registrations of PBRPC Servers do not modify VMX/Hypervisor state and
 
451
       * are allowed.
 
452
       */
 
453
      if (rid == VMCI_UNITY_PBRPC_REGISTER) {
 
454
         return TRUE;
 
455
      } else {
 
456
         return FALSE;
 
457
      }
445
458
   }
446
459
 
447
460
   return TRUE;