~apparmor-dev/apparmor/release-2.5

Viewing all changes in revision 1492.

  • Committer: Steve Beattie
  • Date: 2011-03-07 15:05:37 UTC
  • Revision ID: sbeattie@ubuntu.com-20110307150537-b5muya7qlfwctney
Merge from trunk revs 1676 and 1677: Override AF_MAX for kernels that
don't support proper masking. Older versions of the apparmor kernel
patches didn't handle receiving network tables of a larger size than
expected.  Allow the parser to detect the kernel version and override
the AF_MAX value for those kernels.  This also replaces the hack
using a hardcoded limit of 36 for kernels missing the features flag.

Also, ensure that the buffer read from /proc/sys/kernel/osrelease is
null terminated.

Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-By: Steve Beattie <sbeattie@ubuntu.com>

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: