[PATCH 3.10 116/268] apparmor: check that xindex is in trans_table bounds
From: Willy Tarreau <w@1wt.eu>
Date: 2017-06-19 19:27:18
Also in:
lkml
Subsystem:
apparmor security module, security subsystem, the rest · Maintainers:
John Johansen, Georgia Garcia, Paul Moore, James Morris, "Serge E. Hallyn", Linus Torvalds
From: John Johansen <john.johansen@canonical.com> commit 23ca7b640b4a55f8747301b6bd984dd05545f6a7 upstream. Signed-off-by: John Johansen <john.johansen@canonical.com> Acked-by: Seth Arnold <redacted> Signed-off-by: Jiri Slaby <redacted> Signed-off-by: Willy Tarreau <w@1wt.eu> --- security/apparmor/policy_unpack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c
index 329b1fd..6b22135 100644
--- a/security/apparmor/policy_unpack.c
+++ b/security/apparmor/policy_unpack.c@@ -652,7 +652,7 @@ static bool verify_xindex(int xindex, int table_size) int index, xtype; xtype = xindex & AA_X_TYPE_MASK; index = xindex & AA_X_INDEX_MASK; - if (xtype == AA_X_TABLE && index > table_size) + if (xtype == AA_X_TABLE && index >= table_size) return 0; return 1; }
--
2.8.0.rc2.1.gbe9624a