ima: "remove enforce checking duplication" merge fix
authorMimi Zohar <zohar@linux.vnet.ibm.com>
Mon, 25 Feb 2013 04:42:36 +0000 (23:42 -0500)
committerJames Morris <james.l.morris@oracle.com>
Mon, 25 Feb 2013 15:46:38 +0000 (02:46 +1100)
commita2c2c3a71c25627e4840795b3c269918d0e71b28
treef643772b0087e7bf5a9801ed07580ee8d5ce93c9
parentab7826595e9ec51a51f622c5fc91e2f59440481a
ima: "remove enforce checking duplication" merge fix

Commit "750943a ima: remove enforce checking duplication" combined
the 'in IMA policy' and 'enforcing file integrity' checks.  For
the non-file, kernel module verification, a specific check for
'enforcing file integrity' was not added.  This patch adds the
check.

Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
security/integrity/ima/ima_main.c