From aeb8efb4e7e2a01df9cfff2452caca804cd43c88 Mon Sep 17 00:00:00 2001
From: John Johansen <john.johansen@canonical.com>
Date: Wed, 22 Feb 2012 00:32:30 -0800
Subject: [PATCH] --- yaml --- r: 292291 b: refs/heads/master c:
 8b964eae204d791421677ec56b94a7b18cf8740d h: refs/heads/master i:   292289:
 0b656d6beca1214e35dfe815dee478761ad0e296   292287:
 a9cc0ae647f0d597d42df6e51493db671f869890 v: v3

---
 [refs]                                 | 2 +-
 trunk/security/apparmor/include/file.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1acb1a1b3584..013ea03bac40 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ade3ddc01e2e426cc24c744be85dcaad4e8f8aba
+refs/heads/master: 8b964eae204d791421677ec56b94a7b18cf8740d
diff --git a/trunk/security/apparmor/include/file.h b/trunk/security/apparmor/include/file.h
index ab8c6d87f758..f98fd4701d80 100644
--- a/trunk/security/apparmor/include/file.h
+++ b/trunk/security/apparmor/include/file.h
@@ -117,7 +117,7 @@ static inline u16 dfa_map_xindex(u16 mask)
 		index |= AA_X_NAME;
 	} else if (old_index == 3) {
 		index |= AA_X_NAME | AA_X_CHILD;
-	} else {
+	} else if (old_index) {
 		index |= AA_X_TABLE;
 		index |= old_index - 4;
 	}