1 files changed, 12 insertions, 11 deletions

diff --git a/security/apparmor/match.c b/security/apparmor/match.c
index 90971a8c3789..727eb4200d5c 100644
--- a/security/apparmor/match.c
+++ b/security/apparmor/match.c
@@ -4,7 +4,7 @@
  * This file contains AppArmor dfa based regular expression matching engine
  *
  * Copyright (C) 1998-2008 Novell/SUSE
- * Copyright 2009-2010 Canonical Ltd.
+ * Copyright 2009-2012 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -23,6 +23,8 @@
 #include "include/apparmor.h"
 #include "include/match.h"
 
+#define base_idx(X) ((X) & 0xffffff)
+
 /**
  * unpack_table - unpack a dfa table (one of accept, default, base, next check)
  * @blob: data to unpack (NOT NULL)
@@ -30,7 +32,7 @@
  *
  * Returns: pointer to table else NULL on failure
  *
- * NOTE: must be freed by kvfree (not kmalloc)
+ * NOTE: must be freed by kvfree (not kfree)
  */
 static struct table_header *unpack_table(char *blob, size_t bsize)
 {
@@ -57,7 +59,7 @@ static struct table_header *unpack_table(char *blob, size_t bsize)
         if (bsize < tsize)
                 goto out;
 
-        table = kvmalloc(tsize);
+        table = kvzalloc(tsize);
         if (table) {
                 *table = th;
                 if (th.td_flags == YYTD_DATA8)
@@ -137,8 +139,7 @@ static int verify_dfa(struct aa_dfa *dfa, int flags)
                 for (i = 0; i < state_count; i++) {
                         if (DEFAULT_TABLE(dfa)[i] >= state_count)
                                 goto out;
-                        /* TODO: do check that DEF state recursion terminates */
-                        if (BASE_TABLE(dfa)[i] + 255 >= trans_count) {
+                        if (base_idx(BASE_TABLE(dfa)[i]) + 255 >= trans_count) {
                                 printk(KERN_ERR "AppArmor DFA next/check upper "
                                        "bounds error\n");
                                 goto out;
@@ -314,7 +315,7 @@ unsigned int aa_dfa_match_len(struct aa_dfa *dfa, unsigned int start,
                 u8 *equiv = EQUIV_TABLE(dfa);
                 /* default is direct to next state */
                 for (; len; len--) {
-                        pos = base[state] + equiv[(u8) *str++];
+                        pos = base_idx(base[state]) + equiv[(u8) *str++];
                         if (check[pos] == state)
                                 state = next[pos];
                         else
@@ -323,7 +324,7 @@ unsigned int aa_dfa_match_len(struct aa_dfa *dfa, unsigned int start,
         } else {
                 /* default is direct to next state */
                 for (; len; len--) {
-                        pos = base[state] + (u8) *str++;
+                        pos = base_idx(base[state]) + (u8) *str++;
                         if (check[pos] == state)
                                 state = next[pos];
                         else
@@ -364,7 +365,7 @@ unsigned int aa_dfa_match(struct aa_dfa *dfa, unsigned int start,
                 u8 *equiv = EQUIV_TABLE(dfa);
                 /* default is direct to next state */
                 while (*str) {
-                        pos = base[state] + equiv[(u8) *str++];
+                        pos = base_idx(base[state]) + equiv[(u8) *str++];
                         if (check[pos] == state)
                                 state = next[pos];
                         else
@@ -373,7 +374,7 @@ unsigned int aa_dfa_match(struct aa_dfa *dfa, unsigned int start,
         } else {
                 /* default is direct to next state */
                 while (*str) {
-                        pos = base[state] + (u8) *str++;
+                        pos = base_idx(base[state]) + (u8) *str++;
                         if (check[pos] == state)
                                 state = next[pos];
                         else
@@ -409,14 +410,14 @@ unsigned int aa_dfa_next(struct aa_dfa *dfa, unsigned int state,
                 u8 *equiv = EQUIV_TABLE(dfa);
                 /* default is direct to next state */
 
-                pos = base[state] + equiv[(u8) c];
+                pos = base_idx(base[state]) + equiv[(u8) c];
                 if (check[pos] == state)
                         state = next[pos];
                 else
                         state = def[state];
         } else {
                 /* default is direct to next state */
-                pos = base[state] + (u8) c;
+                pos = base_idx(base[state]) + (u8) c;
                 if (check[pos] == state)
                         state = next[pos];
                 else