From bdd78e31a920fabfb7e7c9629a4c91c6d928f2f0 Mon Sep 17 00:00:00 2001 From: Dmitry Kasatkin Date: Mon, 25 Jun 2012 12:18:09 +0300 Subject: [PATCH] --- yaml --- r: 313613 b: refs/heads/master c: 8445d64dd761440fb5c73a2abba25009f4bf0e4c h: refs/heads/master i: 313611: bb300634667c112a82aaf9a1bd9c2cb7f6b17253 v: v3 --- [refs] | 2 +- trunk/security/integrity/ima/ima_policy.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 926b23d3467d..43fe1cf3abcf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c7de7adc18241a0eb10a6e1fed7cb1e01f53c85a +refs/heads/master: 8445d64dd761440fb5c73a2abba25009f4bf0e4c diff --git a/trunk/security/integrity/ima/ima_policy.c b/trunk/security/integrity/ima/ima_policy.c index d8edff209bf3..1a9583008aae 100644 --- a/trunk/security/integrity/ima/ima_policy.c +++ b/trunk/security/integrity/ima/ima_policy.c @@ -63,6 +63,8 @@ static struct ima_measure_rule_entry default_rules[] = { {.action = DONT_MEASURE,.fsmagic = DEBUGFS_MAGIC,.flags = IMA_FSMAGIC}, {.action = DONT_MEASURE,.fsmagic = TMPFS_MAGIC,.flags = IMA_FSMAGIC}, {.action = DONT_MEASURE,.fsmagic = RAMFS_MAGIC,.flags = IMA_FSMAGIC}, + {.action = DONT_MEASURE,.fsmagic = DEVPTS_SUPER_MAGIC,.flags = IMA_FSMAGIC}, + {.action = DONT_MEASURE,.fsmagic = BINFMTFS_MAGIC,.flags = IMA_FSMAGIC}, {.action = DONT_MEASURE,.fsmagic = SECURITYFS_MAGIC,.flags = IMA_FSMAGIC}, {.action = DONT_MEASURE,.fsmagic = SELINUX_MAGIC,.flags = IMA_FSMAGIC}, {.action = MEASURE,.func = FILE_MMAP,.mask = MAY_EXEC,