Pull-request

Commit Message

The following two patches fix Bug #581525. The first patch is required,
the second patch is optional only being needed if we support using the updated
kernel on a userspace that has not been updated with the corresponding
userspace update, which has already rolled out into updates.
The following changes since commit ca74d536613567c9301308b54001b5861350b596:
UBUNTU: Ubuntu-2.6.32-27.49 (2010-11-30 15:35:53 -0800)
are available in the git repository at:
git://kernel.ubuntu.com/jj/ubuntu-lucid.git master
John Johansen (2):
AppArmor: fix the upper bound check for the next/check table
AppArmor: Allow dfa backward compatibility with broken userspace
security/apparmor/include/apparmor.h | 6 ++++++
security/apparmor/match.c | 11 ++++++++++-
2 files changed, 16 insertions(+), 1 deletions(-)