Skip to content

Commit 27a7cef

Browse files
committed
selinux: move the selinux_blob_sizes struct
Move the selinux_blob_sizes struct so it adjacent to the rest of the SELinux initialization code and not in the middle of the LSM hook callbacks. Signed-off-by: Paul Moore <paul@paul-moore.com>
1 parent 8f0b4cc commit 27a7cef

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

security/selinux/hooks.c

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7158,27 +7158,6 @@ static int selinux_bpf_token_create(struct bpf_token *token, union bpf_attr *att
71587158
}
71597159
#endif
71607160

7161-
struct lsm_blob_sizes selinux_blob_sizes __ro_after_init = {
7162-
.lbs_cred = sizeof(struct cred_security_struct),
7163-
.lbs_task = sizeof(struct task_security_struct),
7164-
.lbs_file = sizeof(struct file_security_struct),
7165-
.lbs_inode = sizeof(struct inode_security_struct),
7166-
.lbs_ipc = sizeof(struct ipc_security_struct),
7167-
.lbs_key = sizeof(struct key_security_struct),
7168-
.lbs_msg_msg = sizeof(struct msg_security_struct),
7169-
#ifdef CONFIG_PERF_EVENTS
7170-
.lbs_perf_event = sizeof(struct perf_event_security_struct),
7171-
#endif
7172-
.lbs_sock = sizeof(struct sk_security_struct),
7173-
.lbs_superblock = sizeof(struct superblock_security_struct),
7174-
.lbs_xattr_count = SELINUX_INODE_INIT_XATTRS,
7175-
.lbs_tun_dev = sizeof(struct tun_security_struct),
7176-
.lbs_ib = sizeof(struct ib_security_struct),
7177-
.lbs_bpf_map = sizeof(struct bpf_security_struct),
7178-
.lbs_bpf_prog = sizeof(struct bpf_security_struct),
7179-
.lbs_bpf_token = sizeof(struct bpf_security_struct),
7180-
};
7181-
71827161
#ifdef CONFIG_PERF_EVENTS
71837162
static int selinux_perf_event_open(int type)
71847163
{
@@ -7297,6 +7276,27 @@ static const struct lsm_id selinux_lsmid = {
72977276
.id = LSM_ID_SELINUX,
72987277
};
72997278

7279+
struct lsm_blob_sizes selinux_blob_sizes __ro_after_init = {
7280+
.lbs_cred = sizeof(struct cred_security_struct),
7281+
.lbs_task = sizeof(struct task_security_struct),
7282+
.lbs_file = sizeof(struct file_security_struct),
7283+
.lbs_inode = sizeof(struct inode_security_struct),
7284+
.lbs_ipc = sizeof(struct ipc_security_struct),
7285+
.lbs_key = sizeof(struct key_security_struct),
7286+
.lbs_msg_msg = sizeof(struct msg_security_struct),
7287+
#ifdef CONFIG_PERF_EVENTS
7288+
.lbs_perf_event = sizeof(struct perf_event_security_struct),
7289+
#endif
7290+
.lbs_sock = sizeof(struct sk_security_struct),
7291+
.lbs_superblock = sizeof(struct superblock_security_struct),
7292+
.lbs_xattr_count = SELINUX_INODE_INIT_XATTRS,
7293+
.lbs_tun_dev = sizeof(struct tun_security_struct),
7294+
.lbs_ib = sizeof(struct ib_security_struct),
7295+
.lbs_bpf_map = sizeof(struct bpf_security_struct),
7296+
.lbs_bpf_prog = sizeof(struct bpf_security_struct),
7297+
.lbs_bpf_token = sizeof(struct bpf_security_struct),
7298+
};
7299+
73007300
/*
73017301
* IMPORTANT NOTE: When adding new hooks, please be careful to keep this order:
73027302
* 1. any hooks that don't belong to (2.) or (3.) below,

0 commit comments

Comments
 (0)