LSM: remove the COMMON_AUDIT_DATA_INIT type expansion
Just open code it so grep on the source code works better.
Signed-off-by: Eric Paris <eparis@redhat.com>
diff --git a/include/linux/lsm_audit.h b/include/linux/lsm_audit.h
index fad48aa..9e1ebf5 100644
--- a/include/linux/lsm_audit.h
+++ b/include/linux/lsm_audit.h
@@ -96,7 +96,7 @@
/* Initialize an LSM audit data structure. */
#define COMMON_AUDIT_DATA_INIT(_d, _t) \
{ memset((_d), 0, sizeof(struct common_audit_data)); \
- (_d)->type = LSM_AUDIT_DATA_##_t; }
+ (_d)->type = _t; }
void common_lsm_audit(struct common_audit_data *a,
void (*pre_audit)(struct audit_buffer *, void *),
diff --git a/security/apparmor/capability.c b/security/apparmor/capability.c
index 088dba3..3ecb8b7 100644
--- a/security/apparmor/capability.c
+++ b/security/apparmor/capability.c
@@ -65,7 +65,7 @@
int type = AUDIT_APPARMOR_AUTO;
struct common_audit_data sa;
struct apparmor_audit_data aad = {0,};
- COMMON_AUDIT_DATA_INIT(&sa, CAP);
+ COMMON_AUDIT_DATA_INIT(&sa, LSM_AUDIT_DATA_CAP);
sa.aad = &aad;
sa.tsk = task;
sa.u.cap = cap;
diff --git a/security/apparmor/file.c b/security/apparmor/file.c
index 2f8fcba..6ab264c 100644
--- a/security/apparmor/file.c
+++ b/security/apparmor/file.c
@@ -108,7 +108,7 @@
int type = AUDIT_APPARMOR_AUTO;
struct common_audit_data sa;
struct apparmor_audit_data aad = {0,};
- COMMON_AUDIT_DATA_INIT(&sa, NONE);
+ COMMON_AUDIT_DATA_INIT(&sa, LSM_AUDIT_DATA_NONE);
sa.aad = &aad;
aad.op = op,
aad.fs.request = request;
diff --git a/security/apparmor/ipc.c b/security/apparmor/ipc.c
index c3da93a..dba449b 100644
--- a/security/apparmor/ipc.c
+++ b/security/apparmor/ipc.c
@@ -42,7 +42,7 @@
{
struct common_audit_data sa;
struct apparmor_audit_data aad = {0,};
- COMMON_AUDIT_DATA_INIT(&sa, NONE);
+ COMMON_AUDIT_DATA_INIT(&sa, LSM_AUDIT_DATA_NONE);
sa.aad = &aad;
aad.op = OP_PTRACE;
aad.target = target;
diff --git a/security/apparmor/lib.c b/security/apparmor/lib.c
index e75829b..b11a265 100644
--- a/security/apparmor/lib.c
+++ b/security/apparmor/lib.c
@@ -66,7 +66,7 @@
if (audit_enabled) {
struct common_audit_data sa;
struct apparmor_audit_data aad = {0,};
- COMMON_AUDIT_DATA_INIT(&sa, NONE);
+ COMMON_AUDIT_DATA_INIT(&sa, LSM_AUDIT_DATA_NONE);
sa.aad = &aad;
aad.info = str;
aa_audit_msg(AUDIT_APPARMOR_STATUS, &sa, NULL);
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index 02fddcd..4f7bc07 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -589,7 +589,7 @@
} else {
struct common_audit_data sa;
struct apparmor_audit_data aad = {0,};
- COMMON_AUDIT_DATA_INIT(&sa, NONE);
+ COMMON_AUDIT_DATA_INIT(&sa, LSM_AUDIT_DATA_NONE);
sa.aad = &aad;
aad.op = OP_SETPROCATTR;
aad.info = name;
diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
index f1f7506..03dbaef 100644
--- a/security/apparmor/policy.c
+++ b/security/apparmor/policy.c
@@ -965,7 +965,7 @@
{
struct common_audit_data sa;
struct apparmor_audit_data aad = {0,};
- COMMON_AUDIT_DATA_INIT(&sa, NONE);
+ COMMON_AUDIT_DATA_INIT(&sa, LSM_AUDIT_DATA_NONE);
sa.aad = &aad;
aad.op = op;
aad.name = name;
diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c
index deab7c7..504ba40 100644
--- a/security/apparmor/policy_unpack.c
+++ b/security/apparmor/policy_unpack.c
@@ -95,7 +95,7 @@
struct aa_profile *profile = __aa_current_profile();
struct common_audit_data sa;
struct apparmor_audit_data aad = {0,};
- COMMON_AUDIT_DATA_INIT(&sa, NONE);
+ COMMON_AUDIT_DATA_INIT(&sa, LSM_AUDIT_DATA_NONE);
sa.aad = &aad;
if (e)
aad.iface.pos = e->pos - e->start;
diff --git a/security/apparmor/resource.c b/security/apparmor/resource.c
index 2fe8613..d06f57b 100644
--- a/security/apparmor/resource.c
+++ b/security/apparmor/resource.c
@@ -52,7 +52,7 @@
struct common_audit_data sa;
struct apparmor_audit_data aad = {0,};
- COMMON_AUDIT_DATA_INIT(&sa, NONE);
+ COMMON_AUDIT_DATA_INIT(&sa, LSM_AUDIT_DATA_NONE);
sa.aad = &aad;
aad.op = OP_SETRLIMIT,
aad.rlim.rlim = resource;
diff --git a/security/selinux/avc.c b/security/selinux/avc.c
index 1a04247..c04eea2 100644
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -469,7 +469,7 @@
if (!a) {
a = &stack_data;
- COMMON_AUDIT_DATA_INIT(a, NONE);
+ COMMON_AUDIT_DATA_INIT(a, LSM_AUDIT_DATA_NONE);
a->selinux_audit_data = &sad;
}
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index b3bd8e1..9f03844 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -1427,7 +1427,7 @@
u32 av = CAP_TO_MASK(cap);
int rc;
- COMMON_AUDIT_DATA_INIT(&ad, CAP);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_CAP);
ad.selinux_audit_data = &sad;
ad.tsk = current;
ad.u.cap = cap;
@@ -1499,7 +1499,7 @@
struct common_audit_data ad;
struct selinux_audit_data sad = {0,};
- COMMON_AUDIT_DATA_INIT(&ad, DENTRY);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_DENTRY);
ad.u.dentry = dentry;
ad.selinux_audit_data = &sad;
return inode_has_perm(cred, inode, av, &ad, 0);
@@ -1516,7 +1516,7 @@
struct common_audit_data ad;
struct selinux_audit_data sad = {0,};
- COMMON_AUDIT_DATA_INIT(&ad, PATH);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_PATH);
ad.u.path = *path;
ad.selinux_audit_data = &sad;
return inode_has_perm(cred, inode, av, &ad, 0);
@@ -1541,7 +1541,7 @@
u32 sid = cred_sid(cred);
int rc;
- COMMON_AUDIT_DATA_INIT(&ad, PATH);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_PATH);
ad.u.path = file->f_path;
ad.selinux_audit_data = &sad;
@@ -1582,7 +1582,7 @@
sid = tsec->sid;
newsid = tsec->create_sid;
- COMMON_AUDIT_DATA_INIT(&ad, DENTRY);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_DENTRY);
ad.u.dentry = dentry;
ad.selinux_audit_data = &sad;
@@ -1637,7 +1637,7 @@
dsec = dir->i_security;
isec = dentry->d_inode->i_security;
- COMMON_AUDIT_DATA_INIT(&ad, DENTRY);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_DENTRY);
ad.u.dentry = dentry;
ad.selinux_audit_data = &sad;
@@ -1685,7 +1685,7 @@
old_is_dir = S_ISDIR(old_dentry->d_inode->i_mode);
new_dsec = new_dir->i_security;
- COMMON_AUDIT_DATA_INIT(&ad, DENTRY);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_DENTRY);
ad.selinux_audit_data = &sad;
ad.u.dentry = old_dentry;
@@ -2011,7 +2011,7 @@
return rc;
}
- COMMON_AUDIT_DATA_INIT(&ad, PATH);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_PATH);
ad.selinux_audit_data = &sad;
ad.u.path = bprm->file->f_path;
@@ -2135,7 +2135,7 @@
/* Revalidate access to inherited open files. */
- COMMON_AUDIT_DATA_INIT(&ad, INODE);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_INODE);
ad.selinux_audit_data = &sad;
spin_lock(&files->file_lock);
@@ -2485,7 +2485,7 @@
if (flags & MS_KERNMOUNT)
return 0;
- COMMON_AUDIT_DATA_INIT(&ad, DENTRY);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_DENTRY);
ad.selinux_audit_data = &sad;
ad.u.dentry = sb->s_root;
return superblock_has_perm(cred, sb, FILESYSTEM__MOUNT, &ad);
@@ -2497,7 +2497,7 @@
struct common_audit_data ad;
struct selinux_audit_data sad = {0,};
- COMMON_AUDIT_DATA_INIT(&ad, DENTRY);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_DENTRY);
ad.selinux_audit_data = &sad;
ad.u.dentry = dentry->d_sb->s_root;
return superblock_has_perm(cred, dentry->d_sb, FILESYSTEM__GETATTR, &ad);
@@ -2667,7 +2667,7 @@
struct inode_security_struct *isec = inode->i_security;
int rc;
- COMMON_AUDIT_DATA_INIT(&ad, INODE);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_INODE);
ad.selinux_audit_data = &sad;
ad.u.inode = inode;
@@ -2797,7 +2797,7 @@
if (!inode_owner_or_capable(inode))
return -EPERM;
- COMMON_AUDIT_DATA_INIT(&ad, DENTRY);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_DENTRY);
ad.selinux_audit_data = &sad;
ad.u.dentry = dentry;
@@ -3412,7 +3412,7 @@
sid = task_sid(current);
- COMMON_AUDIT_DATA_INIT(&ad, KMOD);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_KMOD);
ad.selinux_audit_data = &sad;
ad.u.kmod_name = kmod_name;
@@ -3793,7 +3793,7 @@
if (sksec->sid == SECINITSID_KERNEL)
return 0;
- COMMON_AUDIT_DATA_INIT(&ad, NET);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_NET);
ad.selinux_audit_data = &sad;
ad.u.net = &net;
ad.u.net->sk = sk;
@@ -3901,7 +3901,7 @@
snum, &sid);
if (err)
goto out;
- COMMON_AUDIT_DATA_INIT(&ad, NET);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_NET);
ad.selinux_audit_data = &sad;
ad.u.net = &net;
ad.u.net->sport = htons(snum);
@@ -3936,7 +3936,7 @@
if (err)
goto out;
- COMMON_AUDIT_DATA_INIT(&ad, NET);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_NET);
ad.selinux_audit_data = &sad;
ad.u.net = &net;
ad.u.net->sport = htons(snum);
@@ -3998,7 +3998,7 @@
perm = (sksec->sclass == SECCLASS_TCP_SOCKET) ?
TCP_SOCKET__NAME_CONNECT : DCCP_SOCKET__NAME_CONNECT;
- COMMON_AUDIT_DATA_INIT(&ad, NET);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_NET);
ad.selinux_audit_data = &sad;
ad.u.net = &net;
ad.u.net->dport = htons(snum);
@@ -4095,7 +4095,7 @@
struct lsm_network_audit net = {0,};
int err;
- COMMON_AUDIT_DATA_INIT(&ad, NET);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_NET);
ad.selinux_audit_data = &sad;
ad.u.net = &net;
ad.u.net->sk = other;
@@ -4128,7 +4128,7 @@
struct selinux_audit_data sad = {0,};
struct lsm_network_audit net = {0,};
- COMMON_AUDIT_DATA_INIT(&ad, NET);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_NET);
ad.selinux_audit_data = &sad;
ad.u.net = &net;
ad.u.net->sk = other->sk;
@@ -4171,7 +4171,7 @@
struct lsm_network_audit net = {0,};
char *addrp;
- COMMON_AUDIT_DATA_INIT(&ad, NET);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_NET);
ad.selinux_audit_data = &sad;
ad.u.net = &net;
ad.u.net->netif = skb->skb_iif;
@@ -4227,7 +4227,7 @@
if (!secmark_active && !peerlbl_active)
return 0;
- COMMON_AUDIT_DATA_INIT(&ad, NET);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_NET);
ad.selinux_audit_data = &sad;
ad.u.net = &net;
ad.u.net->netif = skb->skb_iif;
@@ -4584,7 +4584,7 @@
if (selinux_skb_peerlbl_sid(skb, family, &peer_sid) != 0)
return NF_DROP;
- COMMON_AUDIT_DATA_INIT(&ad, NET);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_NET);
ad.selinux_audit_data = &sad;
ad.u.net = &net;
ad.u.net->netif = ifindex;
@@ -4684,7 +4684,7 @@
return NF_ACCEPT;
sksec = sk->sk_security;
- COMMON_AUDIT_DATA_INIT(&ad, NET);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_NET);
ad.selinux_audit_data = &sad;
ad.u.net = &net;
ad.u.net->netif = ifindex;
@@ -4757,7 +4757,7 @@
secmark_perm = PACKET__SEND;
}
- COMMON_AUDIT_DATA_INIT(&ad, NET);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_NET);
ad.selinux_audit_data = &sad;
ad.u.net = &net;
ad.u.net->netif = ifindex;
@@ -4881,7 +4881,7 @@
isec = ipc_perms->security;
- COMMON_AUDIT_DATA_INIT(&ad, IPC);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_IPC);
ad.selinux_audit_data = &sad;
ad.u.ipc_id = ipc_perms->key;
@@ -4913,7 +4913,7 @@
isec = msq->q_perm.security;
- COMMON_AUDIT_DATA_INIT(&ad, IPC);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_IPC);
ad.selinux_audit_data = &sad;
ad.u.ipc_id = msq->q_perm.key;
@@ -4940,7 +4940,7 @@
isec = msq->q_perm.security;
- COMMON_AUDIT_DATA_INIT(&ad, IPC);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_IPC);
ad.selinux_audit_data = &sad;
ad.u.ipc_id = msq->q_perm.key;
@@ -5002,7 +5002,7 @@
return rc;
}
- COMMON_AUDIT_DATA_INIT(&ad, IPC);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_IPC);
ad.selinux_audit_data = &sad;
ad.u.ipc_id = msq->q_perm.key;
@@ -5035,7 +5035,7 @@
isec = msq->q_perm.security;
msec = msg->security;
- COMMON_AUDIT_DATA_INIT(&ad, IPC);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_IPC);
ad.selinux_audit_data = &sad;
ad.u.ipc_id = msq->q_perm.key;
@@ -5062,7 +5062,7 @@
isec = shp->shm_perm.security;
- COMMON_AUDIT_DATA_INIT(&ad, IPC);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_IPC);
ad.selinux_audit_data = &sad;
ad.u.ipc_id = shp->shm_perm.key;
@@ -5089,7 +5089,7 @@
isec = shp->shm_perm.security;
- COMMON_AUDIT_DATA_INIT(&ad, IPC);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_IPC);
ad.selinux_audit_data = &sad;
ad.u.ipc_id = shp->shm_perm.key;
@@ -5158,7 +5158,7 @@
isec = sma->sem_perm.security;
- COMMON_AUDIT_DATA_INIT(&ad, IPC);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_IPC);
ad.selinux_audit_data = &sad;
ad.u.ipc_id = sma->sem_perm.key;
@@ -5185,7 +5185,7 @@
isec = sma->sem_perm.security;
- COMMON_AUDIT_DATA_INIT(&ad, IPC);
+ COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_IPC);
ad.selinux_audit_data = &sad;
ad.u.ipc_id = sma->sem_perm.key;