write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/security/apparmor/ipc.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * AppArmor security module
3
4
  *
..
..
@@ -5,11 +6,6 @@
5
6
  *
6
7
  * Copyright (C) 1998-2008 Novell/SUSE
7
8
  * Copyright 2009-2017 Canonical Ltd.
8
- *
9
- * This program is free software; you can redistribute it and/or
10
- * modify it under the terms of the GNU General Public License as
11
- * published by the Free Software Foundation, version 2 of the
12
- * License.
13
9
  */
14
10
 
15
11
 #include <linux/gfp.h>
..
..
@@ -24,25 +20,23 @@
24
20
 
25
21
 /**
26
22
  * audit_ptrace_mask - convert mask to permission string
27
- * @buffer: buffer to write string to (NOT NULL)
28
23
  * @mask: permission mask to convert
24
+ *
25
+ * Returns: pointer to static string
29
26
  */
30
-static void audit_ptrace_mask(struct audit_buffer *ab, u32 mask)
27
+static const char *audit_ptrace_mask(u32 mask)
31
28
 {
32
29
 	switch (mask) {
33
30
 	case MAY_READ:
34
-		audit_log_string(ab, "read");
35
-		break;
31
+		return "read";
36
32
 	case MAY_WRITE:
37
-		audit_log_string(ab, "trace");
38
-		break;
33
+		return "trace";
39
34
 	case AA_MAY_BE_READ:
40
-		audit_log_string(ab, "readby");
41
-		break;
35
+		return "readby";
42
36
 	case AA_MAY_BE_TRACED:
43
-		audit_log_string(ab, "tracedby");
44
-		break;
37
+		return "tracedby";
45
38
 	}
39
+	return "";
46
40
 }
47
41
 
48
42
 /* call back to audit ptrace fields */
..
..
@@ -51,12 +45,12 @@
51
45
 	struct common_audit_data *sa = va;
52
46
 
53
47
 	if (aad(sa)->request & AA_PTRACE_PERM_MASK) {
54
-		audit_log_format(ab, " requested_mask=");
55
-		audit_ptrace_mask(ab, aad(sa)->request);
48
+		audit_log_format(ab, " requested_mask=\"%s\"",
49
+				 audit_ptrace_mask(aad(sa)->request));
56
50
 
57
51
 		if (aad(sa)->denied & AA_PTRACE_PERM_MASK) {
58
-			audit_log_format(ab, " denied_mask=");
59
-			audit_ptrace_mask(ab, aad(sa)->denied);
52
+			audit_log_format(ab, " denied_mask=\"%s\"",
53
+					 audit_ptrace_mask(aad(sa)->denied));
60
54
 		}
61
55
 	}
62
56
 	audit_log_format(ab, " peer=");
..
..
@@ -146,16 +140,18 @@
146
140
 }
147
141
 
148
142
 /**
149
- * audit_file_mask - convert mask to permission string
150
- * @buffer: buffer to write string to (NOT NULL)
143
+ * audit_signal_mask - convert mask to permission string
151
144
  * @mask: permission mask to convert
145
+ *
146
+ * Returns: pointer to static string
152
147
  */
153
-static void audit_signal_mask(struct audit_buffer *ab, u32 mask)
148
+static const char *audit_signal_mask(u32 mask)
154
149
 {
155
150
 	if (mask & MAY_READ)
156
-		audit_log_string(ab, "receive");
151
+		return "receive";
157
152
 	if (mask & MAY_WRITE)
158
-		audit_log_string(ab, "send");
153
+		return "send";
154
+	return "";
159
155
 }
160
156
 
161
157
 /**
..
..
@@ -168,11 +164,11 @@
168
164
 	struct common_audit_data *sa = va;
169
165
 
170
166
 	if (aad(sa)->request & AA_SIGNAL_PERM_MASK) {
171
-		audit_log_format(ab, " requested_mask=");
172
-		audit_signal_mask(ab, aad(sa)->request);
167
+		audit_log_format(ab, " requested_mask=\"%s\"",
168
+				 audit_signal_mask(aad(sa)->request));
173
169
 		if (aad(sa)->denied & AA_SIGNAL_PERM_MASK) {
174
-			audit_log_format(ab, " denied_mask=");
175
-			audit_signal_mask(ab, aad(sa)->denied);
170
+			audit_log_format(ab, " denied_mask=\"%s\"",
171
+					 audit_signal_mask(aad(sa)->denied));
176
172
 		}
177
173
 	}
178
174
 	if (aad(sa)->signal == SIGUNKNOWN)