6 files changed, 13 insertions, 13 deletions

diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c
index 0b759e17a131..198e60903685 100644
--- a/security/integrity/digsig.c
+++ b/security/integrity/digsig.c
@@ -28,7 +28,7 @@ static const char *keyring_name[INTEGRITY_KEYRING_MAX] = {
 };
 
 int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen,
-                                        const char *digest, int digestlen)
+                            const char *digest, int digestlen)
 {
         if (id >= INTEGRITY_KEYRING_MAX)
                 return -EINVAL;
diff --git a/security/integrity/evm/evm_posix_acl.c b/security/integrity/evm/evm_posix_acl.c
index b1753e98bf9a..46408b9e62e8 100644
--- a/security/integrity/evm/evm_posix_acl.c
+++ b/security/integrity/evm/evm_posix_acl.c
@@ -11,8 +11,9 @@
 
 #include <linux/module.h>
 #include <linux/xattr.h>
+#include <linux/evm.h>
 
-int posix_xattr_acl(char *xattr)
+int posix_xattr_acl(const char *xattr)
 {
         int xattr_len = strlen(xattr);
 
diff --git a/security/integrity/ima/ima_appraise.c b/security/integrity/ima/ima_appraise.c
index 2d4becab8918..e3230d6a8d96 100644
--- a/security/integrity/ima/ima_appraise.c
+++ b/security/integrity/ima/ima_appraise.c
@@ -55,7 +55,7 @@ static int ima_fix_xattr(struct dentry *dentry,
 enum integrity_status ima_get_cache_status(struct integrity_iint_cache *iint,
                                            int func)
 {
-        switch(func) {
+        switch (func) {
         case MMAP_CHECK:
                 return iint->ima_mmap_status;
         case BPRM_CHECK:
@@ -71,7 +71,7 @@ enum integrity_status ima_get_cache_status(struct integrity_iint_cache *iint,
 static void ima_set_cache_status(struct integrity_iint_cache *iint,
                                  int func, enum integrity_status status)
 {
-        switch(func) {
+        switch (func) {
         case MMAP_CHECK:
                 iint->ima_mmap_status = status;
                 break;
@@ -90,7 +90,7 @@ static void ima_set_cache_status(struct integrity_iint_cache *iint,
 
 static void ima_cache_flags(struct integrity_iint_cache *iint, int func)
 {
-        switch(func) {
+        switch (func) {
         case MMAP_CHECK:
                 iint->flags |= (IMA_MMAP_APPRAISED | IMA_APPRAISED);
                 break;
diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
index 38477c9c3415..5f0fd113433a 100644
--- a/security/integrity/ima/ima_fs.c
+++ b/security/integrity/ima/ima_fs.c
@@ -88,8 +88,7 @@ static void *ima_measurements_next(struct seq_file *m, void *v, loff_t *pos)
          * against concurrent list-extension
          */
         rcu_read_lock();
-        qe = list_entry_rcu(qe->later.next,
-                            struct ima_queue_entry, later);
+        qe = list_entry_rcu(qe->later.next, struct ima_queue_entry, later);
         rcu_read_unlock();
         (*pos)++;
 
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index e9508d5bbfcf..0f359df6344c 100644
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -244,9 +244,9 @@ int ima_file_mmap(struct file *file, unsigned long prot)
 int ima_bprm_check(struct linux_binprm *bprm)
 {
         return process_measurement(bprm->file,
-                                 (strcmp(bprm->filename, bprm->interp) == 0) ?
-                                 bprm->filename : bprm->interp,
-                                 MAY_EXEC, BPRM_CHECK);
+                                   (strcmp(bprm->filename, bprm->interp) == 0) ?
+                                   bprm->filename : bprm->interp,
+                                   MAY_EXEC, BPRM_CHECK);
 }
 
 /**
@@ -263,8 +263,8 @@ int ima_file_check(struct file *file, int mask)
 {
         ima_rdwr_violation_check(file);
         return process_measurement(file, NULL,
-                                 mask & (MAY_READ | MAY_WRITE | MAY_EXEC),
-                                 FILE_CHECK);
+                                   mask & (MAY_READ | MAY_WRITE | MAY_EXEC),
+                                   FILE_CHECK);
 }
 EXPORT_SYMBOL_GPL(ima_file_check);
 
diff --git a/security/integrity/integrity.h b/security/integrity/integrity.h
index c42fb7a70dee..f86731649f54 100644
--- a/security/integrity/integrity.h
+++ b/security/integrity/integrity.h
@@ -89,7 +89,7 @@ struct integrity_iint_cache *integrity_iint_find(struct inode *inode);
 #ifdef CONFIG_INTEGRITY_SIGNATURE
 
 int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen,
-                                        const char *digest, int digestlen);
+                            const char *digest, int digestlen);
 
 #else