From ccfa453e949b4186f7264e415ff36ddaa19b4c92 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Thu, 3 Jun 2021 17:04:46 +0100 Subject: [PATCH] ANDROID: security: Realign code titbits with Mainline Trivial changes rectifying one '\n' disparity and another ordering one. Signed-off-by: Lee Jones Change-Id: I8c0e3d0c91de6427cc97bda5d2149bbc9408f575 --- security/lsm_audit.c | 1 - security/selinux/include/classmap.h | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/security/lsm_audit.c b/security/lsm_audit.c index 93e9912ff464..82ce14933513 100644 --- a/security/lsm_audit.c +++ b/security/lsm_audit.c @@ -433,7 +433,6 @@ static void dump_common_audit_data(struct audit_buffer *ab, case LSM_AUDIT_DATA_LOCKDOWN: audit_log_format(ab, " lockdown_reason=\"%s\"", lockdown_reasons[a->u.reason]); - break; } /* switch (a->type) */ } diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h index 795e015b9e76..a10200eebe52 100644 --- a/security/selinux/include/classmap.h +++ b/security/selinux/include/classmap.h @@ -249,10 +249,10 @@ struct security_class_mapping secclass_map[] = { { COMMON_SOCK_PERMS, NULL } }, { "perf_event", { "open", "cpu", "kernel", "tracepoint", "read", "write", NULL } }, - { "anon_inode", - { COMMON_FILE_PERMS, NULL } }, { "lockdown", { "integrity", "confidentiality", NULL } }, + { "anon_inode", + { COMMON_FILE_PERMS, NULL } }, { NULL } };