aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristos Gkekas <chris.gekas@gmail.com>2017-07-08 15:50:21 -0400
committerJohn Johansen <john.johansen@canonical.com>2017-09-22 16:00:57 -0400
commit86aea56f14929ff1c05eca1776e9068e907429d5 (patch)
treea07652c9a5e08fc4a63713d07722240d062f383f
parent19fe43a54fb67b6cc8857e65c78e1dc8aa2e97a3 (diff)
apparmor: Fix logical error in verify_header()
verify_header() is currently checking whether interface version is less than 5 *and* greater than 7, which always evaluates to false. Instead it should check whether it is less than 5 *or* greater than 7. Signed-off-by: Christos Gkekas <chris.gekas@gmail.com> Signed-off-by: John Johansen <john.johansen@canonical.com>
-rw-r--r--security/apparmor/policy_unpack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c
index 2d5a1a007b06..bda0dce3b582 100644
--- a/security/apparmor/policy_unpack.c
+++ b/security/apparmor/policy_unpack.c
@@ -832,7 +832,7 @@ static int verify_header(struct aa_ext *e, int required, const char **ns)
832 * if not specified use previous version 832 * if not specified use previous version
833 * Mask off everything that is not kernel abi version 833 * Mask off everything that is not kernel abi version
834 */ 834 */
835 if (VERSION_LT(e->version, v5) && VERSION_GT(e->version, v7)) { 835 if (VERSION_LT(e->version, v5) || VERSION_GT(e->version, v7)) {
836 audit_iface(NULL, NULL, NULL, "unsupported interface version", 836 audit_iface(NULL, NULL, NULL, "unsupported interface version",
837 e, error); 837 e, error);
838 return error; 838 return error;