← Back to branch summary

~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools.raring-precise.backport

« back to all changes in this revision

Viewing changes to lib/include/includeCheck.h

  • Committer: Nate Muench
  • Date: 2013-06-07 19:36:13 UTC
  • mfrom: (1.4.7)
  • Revision ID: nowiwilldestroyabydos@gmail.com-20130607193613-kctd63r2cs35g2ms
Tags: 2012.12.26-958366-0ubuntu1
https://launchpad.net/bugs/1083719
* Merging upstream version 2012.12.26-958366.
  - Adds support for 3.5 Kernels (LP: #1083719)
* Adding patch from Mathias Krause <minipli@googlemail.com> to fix
  kernel stack memory leack in vsock module [CVE-2013-3237].

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/include/includeCheck.h
160
160
#endif
161
161
#undef INCLUDE_ALLOW_VMIROM
162
162
 
163
 
#if defined INCLUDE_ALLOW_MKS && !defined LOCALMKS && !defined REMOTEMKS
 
163
#if defined INCLUDE_ALLOW_MKS && \
 
164
    !(defined LOCALMKS  || defined REMOTEMKS || \
 
165
      defined SERVERMKS || defined CLIENTMKS)
164
166
#error "The surrounding include file is not allowed outside of the MKS."
165
167
#endif
166
168
#undef INCLUDE_ALLOW_MKS