Commit
cb84aa9b42b506299e5aea1ba4da26c03ab12877
Exists in
master
and in
39 other branches
8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y
LSM Audit: rename LSM_AUDIT_NO_AUDIT to LSM_AUDIT_DATA_NONE
Most of the LSM common audit work uses LSM_AUDIT_DATA_* for the naming.
This was not so for LSM_AUDIT_NO_AUDIT which means the generic initializer
cannot be used. This patch just renames the flag so the generic
initializer can be used.
Signed-off-by: Eric Paris <eparis@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
Showing
3 changed files
with
3 additions
and
4 deletions
Side-by-side Diff
... |
... |
@@ -33,7 +33,7 @@ |
33
|
33 |
#define LSM_AUDIT_DATA_IPC 4 |
34
|
34 |
#define LSM_AUDIT_DATA_TASK 5 |
35
|
35 |
#define LSM_AUDIT_DATA_KEY 6 |
36
|
|
-#define LSM_AUDIT_NO_AUDIT 7 |
|
36 |
+#define LSM_AUDIT_DATA_NONE 7 |
37
|
37 |
#define LSM_AUDIT_DATA_KMOD 8 |
38
|
38 |
struct task_struct *tsk; |
39
|
39 |
union { |
... |
... |
@@ -220,7 +220,7 @@ |
220
|
220 |
} |
221
|
221 |
|
222
|
222 |
switch (a->type) { |
223
|
|
- case LSM_AUDIT_NO_AUDIT: |
|
223 |
+ case LSM_AUDIT_DATA_NONE: |
224
|
224 |
return; |
225
|
225 |
case LSM_AUDIT_DATA_IPC: |
226
|
226 |
audit_log_format(ab, " key=%d ", a->u.ipc_id); |
... |
... |
@@ -499,8 +499,7 @@ |
499
|
499 |
return; |
500
|
500 |
if (!a) { |
501
|
501 |
a = &stack_data; |
502
|
|
- memset(a, 0, sizeof(*a)); |
503
|
|
- a->type = LSM_AUDIT_NO_AUDIT; |
|
502 |
+ COMMON_AUDIT_DATA_INIT(a, NONE); |
504
|
503 |
} |
505
|
504 |
a->selinux_audit_data.tclass = tclass; |
506
|
505 |
a->selinux_audit_data.requested = requested; |