1 // SPDX-License-Identifier: GPL-2.0-or-later <<
2 /* auditsc.c -- System-call auditing support 1 /* auditsc.c -- System-call auditing support
3 * Handles all system-call specific auditing f 2 * Handles all system-call specific auditing features.
4 * 3 *
5 * Copyright 2003-2004 Red Hat Inc., Durham, N 4 * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina.
6 * Copyright 2005 Hewlett-Packard Development 5 * Copyright 2005 Hewlett-Packard Development Company, L.P.
7 * Copyright (C) 2005, 2006 IBM Corporation 6 * Copyright (C) 2005, 2006 IBM Corporation
8 * All Rights Reserved. 7 * All Rights Reserved.
9 * 8 *
>> 9 * This program is free software; you can redistribute it and/or modify
>> 10 * it under the terms of the GNU General Public License as published by
>> 11 * the Free Software Foundation; either version 2 of the License, or
>> 12 * (at your option) any later version.
>> 13 *
>> 14 * This program is distributed in the hope that it will be useful,
>> 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> 17 * GNU General Public License for more details.
>> 18 *
>> 19 * You should have received a copy of the GNU General Public License
>> 20 * along with this program; if not, write to the Free Software
>> 21 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
>> 22 *
10 * Written by Rickard E. (Rik) Faith <faith@re 23 * Written by Rickard E. (Rik) Faith <faith@redhat.com>
11 * 24 *
12 * Many of the ideas implemented here are from 25 * Many of the ideas implemented here are from Stephen C. Tweedie,
13 * especially the idea of avoiding a copy by u 26 * especially the idea of avoiding a copy by using getname.
14 * 27 *
15 * The method for actual interception of sysca 28 * The method for actual interception of syscall entry and exit (not in
16 * this file -- see entry.S) is based on a GPL 29 * this file -- see entry.S) is based on a GPL'd patch written by
17 * okir@suse.de and Copyright 2003 SuSE Linux 30 * okir@suse.de and Copyright 2003 SuSE Linux AG.
18 * 31 *
19 * POSIX message queue support added by George 32 * POSIX message queue support added by George Wilson <ltcgcw@us.ibm.com>,
20 * 2006. 33 * 2006.
21 * 34 *
22 * The support of additional filter rules comp 35 * The support of additional filter rules compares (>, <, >=, <=) was
23 * added by Dustin Kirkland <dustin.kirkland@u 36 * added by Dustin Kirkland <dustin.kirkland@us.ibm.com>, 2005.
24 * 37 *
25 * Modified by Amy Griffis <amy.griffis@hp.com 38 * Modified by Amy Griffis <amy.griffis@hp.com> to collect additional
26 * filesystem information. 39 * filesystem information.
27 * 40 *
28 * Subject and object context labeling support 41 * Subject and object context labeling support added by <danjones@us.ibm.com>
29 * and <dustin.kirkland@us.ibm.com> for LSPP c 42 * and <dustin.kirkland@us.ibm.com> for LSPP certification compliance.
30 */ 43 */
31 44
32 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 45 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
33 46
34 #include <linux/init.h> 47 #include <linux/init.h>
35 #include <asm/types.h> 48 #include <asm/types.h>
36 #include <linux/atomic.h> 49 #include <linux/atomic.h>
37 #include <linux/fs.h> 50 #include <linux/fs.h>
38 #include <linux/namei.h> 51 #include <linux/namei.h>
39 #include <linux/mm.h> 52 #include <linux/mm.h>
40 #include <linux/export.h> 53 #include <linux/export.h>
41 #include <linux/slab.h> 54 #include <linux/slab.h>
42 #include <linux/mount.h> 55 #include <linux/mount.h>
43 #include <linux/socket.h> 56 #include <linux/socket.h>
44 #include <linux/mqueue.h> 57 #include <linux/mqueue.h>
45 #include <linux/audit.h> 58 #include <linux/audit.h>
46 #include <linux/personality.h> 59 #include <linux/personality.h>
47 #include <linux/time.h> 60 #include <linux/time.h>
48 #include <linux/netlink.h> 61 #include <linux/netlink.h>
49 #include <linux/compiler.h> 62 #include <linux/compiler.h>
50 #include <asm/unistd.h> 63 #include <asm/unistd.h>
51 #include <linux/security.h> 64 #include <linux/security.h>
52 #include <linux/list.h> 65 #include <linux/list.h>
53 #include <linux/binfmts.h> 66 #include <linux/binfmts.h>
54 #include <linux/highmem.h> 67 #include <linux/highmem.h>
55 #include <linux/syscalls.h> 68 #include <linux/syscalls.h>
56 #include <asm/syscall.h> 69 #include <asm/syscall.h>
57 #include <linux/capability.h> 70 #include <linux/capability.h>
58 #include <linux/fs_struct.h> 71 #include <linux/fs_struct.h>
59 #include <linux/compat.h> 72 #include <linux/compat.h>
60 #include <linux/ctype.h> 73 #include <linux/ctype.h>
61 #include <linux/string.h> 74 #include <linux/string.h>
62 #include <linux/uaccess.h> 75 #include <linux/uaccess.h>
63 #include <linux/fsnotify_backend.h> 76 #include <linux/fsnotify_backend.h>
64 #include <uapi/linux/limits.h> 77 #include <uapi/linux/limits.h>
65 #include <uapi/linux/netfilter/nf_tables.h> <<
66 #include <uapi/linux/openat2.h> // struct open <<
67 #include <uapi/linux/fanotify.h> <<
68 78
69 #include "audit.h" 79 #include "audit.h"
70 80
71 /* flags stating the success for a syscall */ 81 /* flags stating the success for a syscall */
72 #define AUDITSC_INVALID 0 82 #define AUDITSC_INVALID 0
73 #define AUDITSC_SUCCESS 1 83 #define AUDITSC_SUCCESS 1
74 #define AUDITSC_FAILURE 2 84 #define AUDITSC_FAILURE 2
75 85
76 /* no execve audit message should be longer th 86 /* no execve audit message should be longer than this (userspace limits),
77 * see the note near the top of audit_log_exec 87 * see the note near the top of audit_log_execve_info() about this value */
78 #define MAX_EXECVE_AUDIT_LEN 7500 88 #define MAX_EXECVE_AUDIT_LEN 7500
79 89
80 /* max length to print of cmdline/proctitle va 90 /* max length to print of cmdline/proctitle value during audit */
81 #define MAX_PROCTITLE_AUDIT_LEN 128 91 #define MAX_PROCTITLE_AUDIT_LEN 128
82 92
83 /* number of audit rules */ 93 /* number of audit rules */
84 int audit_n_rules; 94 int audit_n_rules;
85 95
86 /* determines whether we collect data for sign 96 /* determines whether we collect data for signals sent */
87 int audit_signals; 97 int audit_signals;
88 98
89 struct audit_aux_data { 99 struct audit_aux_data {
90 struct audit_aux_data *next; 100 struct audit_aux_data *next;
91 int type; 101 int type;
92 }; 102 };
93 103
>> 104 #define AUDIT_AUX_IPCPERM 0
>> 105
94 /* Number of target pids per aux struct. */ 106 /* Number of target pids per aux struct. */
95 #define AUDIT_AUX_PIDS 16 107 #define AUDIT_AUX_PIDS 16
96 108
97 struct audit_aux_data_pids { 109 struct audit_aux_data_pids {
98 struct audit_aux_data d; 110 struct audit_aux_data d;
99 pid_t target_pid[AUD 111 pid_t target_pid[AUDIT_AUX_PIDS];
100 kuid_t target_auid[AU 112 kuid_t target_auid[AUDIT_AUX_PIDS];
101 kuid_t target_uid[AUD 113 kuid_t target_uid[AUDIT_AUX_PIDS];
102 unsigned int target_session 114 unsigned int target_sessionid[AUDIT_AUX_PIDS];
103 u32 target_sid[AUD 115 u32 target_sid[AUDIT_AUX_PIDS];
104 char target_comm[AU 116 char target_comm[AUDIT_AUX_PIDS][TASK_COMM_LEN];
105 int pid_count; 117 int pid_count;
106 }; 118 };
107 119
108 struct audit_aux_data_bprm_fcaps { 120 struct audit_aux_data_bprm_fcaps {
109 struct audit_aux_data d; 121 struct audit_aux_data d;
110 struct audit_cap_data fcap; 122 struct audit_cap_data fcap;
111 unsigned int fcap_ver; 123 unsigned int fcap_ver;
112 struct audit_cap_data old_pcap; 124 struct audit_cap_data old_pcap;
113 struct audit_cap_data new_pcap; 125 struct audit_cap_data new_pcap;
114 }; 126 };
115 127
116 struct audit_tree_refs { 128 struct audit_tree_refs {
117 struct audit_tree_refs *next; 129 struct audit_tree_refs *next;
118 struct audit_chunk *c[31]; 130 struct audit_chunk *c[31];
119 }; 131 };
120 132
121 struct audit_nfcfgop_tab { <<
122 enum audit_nfcfgop op; <<
123 const char *s; <<
124 }; <<
125 <<
126 static const struct audit_nfcfgop_tab audit_nf <<
127 { AUDIT_XT_OP_REGISTER, <<
128 { AUDIT_XT_OP_REPLACE, <<
129 { AUDIT_XT_OP_UNREGISTER, <<
130 { AUDIT_NFT_OP_TABLE_REGISTER, <<
131 { AUDIT_NFT_OP_TABLE_UNREGISTER, <<
132 { AUDIT_NFT_OP_CHAIN_REGISTER, <<
133 { AUDIT_NFT_OP_CHAIN_UNREGISTER, <<
134 { AUDIT_NFT_OP_RULE_REGISTER, <<
135 { AUDIT_NFT_OP_RULE_UNREGISTER, <<
136 { AUDIT_NFT_OP_SET_REGISTER, <<
137 { AUDIT_NFT_OP_SET_UNREGISTER, <<
138 { AUDIT_NFT_OP_SETELEM_REGISTER, <<
139 { AUDIT_NFT_OP_SETELEM_UNREGISTER, <<
140 { AUDIT_NFT_OP_GEN_REGISTER, <<
141 { AUDIT_NFT_OP_OBJ_REGISTER, <<
142 { AUDIT_NFT_OP_OBJ_UNREGISTER, <<
143 { AUDIT_NFT_OP_OBJ_RESET, <<
144 { AUDIT_NFT_OP_FLOWTABLE_REGISTER, <<
145 { AUDIT_NFT_OP_FLOWTABLE_UNREGISTER, <<
146 { AUDIT_NFT_OP_SETELEM_RESET, <<
147 { AUDIT_NFT_OP_RULE_RESET, <<
148 { AUDIT_NFT_OP_INVALID, <<
149 }; <<
150 <<
151 static int audit_match_perm(struct audit_conte 133 static int audit_match_perm(struct audit_context *ctx, int mask)
152 { 134 {
153 unsigned n; 135 unsigned n;
154 <<
155 if (unlikely(!ctx)) 136 if (unlikely(!ctx))
156 return 0; 137 return 0;
157 n = ctx->major; 138 n = ctx->major;
158 139
159 switch (audit_classify_syscall(ctx->ar 140 switch (audit_classify_syscall(ctx->arch, n)) {
160 case AUDITSC_NATIVE: !! 141 case 0: /* native */
161 if ((mask & AUDIT_PERM_WRITE) 142 if ((mask & AUDIT_PERM_WRITE) &&
162 audit_match_class(AUDIT_C 143 audit_match_class(AUDIT_CLASS_WRITE, n))
163 return 1; 144 return 1;
164 if ((mask & AUDIT_PERM_READ) & 145 if ((mask & AUDIT_PERM_READ) &&
165 audit_match_class(AUDIT_C 146 audit_match_class(AUDIT_CLASS_READ, n))
166 return 1; 147 return 1;
167 if ((mask & AUDIT_PERM_ATTR) & 148 if ((mask & AUDIT_PERM_ATTR) &&
168 audit_match_class(AUDIT_C 149 audit_match_class(AUDIT_CLASS_CHATTR, n))
169 return 1; 150 return 1;
170 return 0; 151 return 0;
171 case AUDITSC_COMPAT: /* 32bit on biarc !! 152 case 1: /* 32bit on biarch */
172 if ((mask & AUDIT_PERM_WRITE) 153 if ((mask & AUDIT_PERM_WRITE) &&
173 audit_match_class(AUDIT_C 154 audit_match_class(AUDIT_CLASS_WRITE_32, n))
174 return 1; 155 return 1;
175 if ((mask & AUDIT_PERM_READ) & 156 if ((mask & AUDIT_PERM_READ) &&
176 audit_match_class(AUDIT_C 157 audit_match_class(AUDIT_CLASS_READ_32, n))
177 return 1; 158 return 1;
178 if ((mask & AUDIT_PERM_ATTR) & 159 if ((mask & AUDIT_PERM_ATTR) &&
179 audit_match_class(AUDIT_C 160 audit_match_class(AUDIT_CLASS_CHATTR_32, n))
180 return 1; 161 return 1;
181 return 0; 162 return 0;
182 case AUDITSC_OPEN: !! 163 case 2: /* open */
183 return mask & ACC_MODE(ctx->ar 164 return mask & ACC_MODE(ctx->argv[1]);
184 case AUDITSC_OPENAT: !! 165 case 3: /* openat */
185 return mask & ACC_MODE(ctx->ar 166 return mask & ACC_MODE(ctx->argv[2]);
186 case AUDITSC_SOCKETCALL: !! 167 case 4: /* socketcall */
187 return ((mask & AUDIT_PERM_WRI 168 return ((mask & AUDIT_PERM_WRITE) && ctx->argv[0] == SYS_BIND);
188 case AUDITSC_EXECVE: !! 169 case 5: /* execve */
189 return mask & AUDIT_PERM_EXEC; 170 return mask & AUDIT_PERM_EXEC;
190 case AUDITSC_OPENAT2: <<
191 return mask & ACC_MODE((u32)ct <<
192 default: 171 default:
193 return 0; 172 return 0;
194 } 173 }
195 } 174 }
196 175
197 static int audit_match_filetype(struct audit_c 176 static int audit_match_filetype(struct audit_context *ctx, int val)
198 { 177 {
199 struct audit_names *n; 178 struct audit_names *n;
200 umode_t mode = (umode_t)val; 179 umode_t mode = (umode_t)val;
201 180
202 if (unlikely(!ctx)) 181 if (unlikely(!ctx))
203 return 0; 182 return 0;
204 183
205 list_for_each_entry(n, &ctx->names_lis 184 list_for_each_entry(n, &ctx->names_list, list) {
206 if ((n->ino != AUDIT_INO_UNSET 185 if ((n->ino != AUDIT_INO_UNSET) &&
207 ((n->mode & S_IFMT) == mod 186 ((n->mode & S_IFMT) == mode))
208 return 1; 187 return 1;
209 } 188 }
210 189
211 return 0; 190 return 0;
212 } 191 }
213 192
214 /* 193 /*
215 * We keep a linked list of fixed-sized (31 po 194 * We keep a linked list of fixed-sized (31 pointer) arrays of audit_chunk *;
216 * ->first_trees points to its beginning, ->tr 195 * ->first_trees points to its beginning, ->trees - to the current end of data.
217 * ->tree_count is the number of free entries 196 * ->tree_count is the number of free entries in array pointed to by ->trees.
218 * Original condition is (NULL, NULL, 0); as s 197 * Original condition is (NULL, NULL, 0); as soon as it grows we never revert to NULL,
219 * "empty" becomes (p, p, 31) afterwards. We 198 * "empty" becomes (p, p, 31) afterwards. We don't shrink the list (and seriously,
220 * it's going to remain 1-element for almost a 199 * it's going to remain 1-element for almost any setup) until we free context itself.
221 * References in it _are_ dropped - at the sam 200 * References in it _are_ dropped - at the same time we free/drop aux stuff.
222 */ 201 */
223 202
224 static void audit_set_auditable(struct audit_c 203 static void audit_set_auditable(struct audit_context *ctx)
225 { 204 {
226 if (!ctx->prio) { 205 if (!ctx->prio) {
227 ctx->prio = 1; 206 ctx->prio = 1;
228 ctx->current_state = AUDIT_STA !! 207 ctx->current_state = AUDIT_RECORD_CONTEXT;
229 } 208 }
230 } 209 }
231 210
232 static int put_tree_ref(struct audit_context * 211 static int put_tree_ref(struct audit_context *ctx, struct audit_chunk *chunk)
233 { 212 {
234 struct audit_tree_refs *p = ctx->trees 213 struct audit_tree_refs *p = ctx->trees;
235 int left = ctx->tree_count; 214 int left = ctx->tree_count;
236 <<
237 if (likely(left)) { 215 if (likely(left)) {
238 p->c[--left] = chunk; 216 p->c[--left] = chunk;
239 ctx->tree_count = left; 217 ctx->tree_count = left;
240 return 1; 218 return 1;
241 } 219 }
242 if (!p) 220 if (!p)
243 return 0; 221 return 0;
244 p = p->next; 222 p = p->next;
245 if (p) { 223 if (p) {
246 p->c[30] = chunk; 224 p->c[30] = chunk;
247 ctx->trees = p; 225 ctx->trees = p;
248 ctx->tree_count = 30; 226 ctx->tree_count = 30;
249 return 1; 227 return 1;
250 } 228 }
251 return 0; 229 return 0;
252 } 230 }
253 231
254 static int grow_tree_refs(struct audit_context 232 static int grow_tree_refs(struct audit_context *ctx)
255 { 233 {
256 struct audit_tree_refs *p = ctx->trees 234 struct audit_tree_refs *p = ctx->trees;
257 <<
258 ctx->trees = kzalloc(sizeof(struct aud 235 ctx->trees = kzalloc(sizeof(struct audit_tree_refs), GFP_KERNEL);
259 if (!ctx->trees) { 236 if (!ctx->trees) {
260 ctx->trees = p; 237 ctx->trees = p;
261 return 0; 238 return 0;
262 } 239 }
263 if (p) 240 if (p)
264 p->next = ctx->trees; 241 p->next = ctx->trees;
265 else 242 else
266 ctx->first_trees = ctx->trees; 243 ctx->first_trees = ctx->trees;
267 ctx->tree_count = 31; 244 ctx->tree_count = 31;
268 return 1; 245 return 1;
269 } 246 }
270 247
271 static void unroll_tree_refs(struct audit_cont 248 static void unroll_tree_refs(struct audit_context *ctx,
272 struct audit_tree_refs * 249 struct audit_tree_refs *p, int count)
273 { 250 {
274 struct audit_tree_refs *q; 251 struct audit_tree_refs *q;
275 int n; 252 int n;
276 <<
277 if (!p) { 253 if (!p) {
278 /* we started with empty chain 254 /* we started with empty chain */
279 p = ctx->first_trees; 255 p = ctx->first_trees;
280 count = 31; 256 count = 31;
281 /* if the very first allocatio 257 /* if the very first allocation has failed, nothing to do */
282 if (!p) 258 if (!p)
283 return; 259 return;
284 } 260 }
285 n = count; 261 n = count;
286 for (q = p; q != ctx->trees; q = q->ne 262 for (q = p; q != ctx->trees; q = q->next, n = 31) {
287 while (n--) { 263 while (n--) {
288 audit_put_chunk(q->c[n 264 audit_put_chunk(q->c[n]);
289 q->c[n] = NULL; 265 q->c[n] = NULL;
290 } 266 }
291 } 267 }
292 while (n-- > ctx->tree_count) { 268 while (n-- > ctx->tree_count) {
293 audit_put_chunk(q->c[n]); 269 audit_put_chunk(q->c[n]);
294 q->c[n] = NULL; 270 q->c[n] = NULL;
295 } 271 }
296 ctx->trees = p; 272 ctx->trees = p;
297 ctx->tree_count = count; 273 ctx->tree_count = count;
298 } 274 }
299 275
300 static void free_tree_refs(struct audit_contex 276 static void free_tree_refs(struct audit_context *ctx)
301 { 277 {
302 struct audit_tree_refs *p, *q; 278 struct audit_tree_refs *p, *q;
303 <<
304 for (p = ctx->first_trees; p; p = q) { 279 for (p = ctx->first_trees; p; p = q) {
305 q = p->next; 280 q = p->next;
306 kfree(p); 281 kfree(p);
307 } 282 }
308 } 283 }
309 284
310 static int match_tree_refs(struct audit_contex 285 static int match_tree_refs(struct audit_context *ctx, struct audit_tree *tree)
311 { 286 {
312 struct audit_tree_refs *p; 287 struct audit_tree_refs *p;
313 int n; 288 int n;
314 <<
315 if (!tree) 289 if (!tree)
316 return 0; 290 return 0;
317 /* full ones */ 291 /* full ones */
318 for (p = ctx->first_trees; p != ctx->t 292 for (p = ctx->first_trees; p != ctx->trees; p = p->next) {
319 for (n = 0; n < 31; n++) 293 for (n = 0; n < 31; n++)
320 if (audit_tree_match(p 294 if (audit_tree_match(p->c[n], tree))
321 return 1; 295 return 1;
322 } 296 }
323 /* partial */ 297 /* partial */
324 if (p) { 298 if (p) {
325 for (n = ctx->tree_count; n < 299 for (n = ctx->tree_count; n < 31; n++)
326 if (audit_tree_match(p 300 if (audit_tree_match(p->c[n], tree))
327 return 1; 301 return 1;
328 } 302 }
329 return 0; 303 return 0;
330 } 304 }
331 305
332 static int audit_compare_uid(kuid_t uid, 306 static int audit_compare_uid(kuid_t uid,
333 struct audit_name 307 struct audit_names *name,
334 struct audit_fiel 308 struct audit_field *f,
335 struct audit_cont 309 struct audit_context *ctx)
336 { 310 {
337 struct audit_names *n; 311 struct audit_names *n;
338 int rc; 312 int rc;
339 !! 313
340 if (name) { 314 if (name) {
341 rc = audit_uid_comparator(uid, 315 rc = audit_uid_comparator(uid, f->op, name->uid);
342 if (rc) 316 if (rc)
343 return rc; 317 return rc;
344 } 318 }
345 !! 319
346 if (ctx) { 320 if (ctx) {
347 list_for_each_entry(n, &ctx->n 321 list_for_each_entry(n, &ctx->names_list, list) {
348 rc = audit_uid_compara 322 rc = audit_uid_comparator(uid, f->op, n->uid);
349 if (rc) 323 if (rc)
350 return rc; 324 return rc;
351 } 325 }
352 } 326 }
353 return 0; 327 return 0;
354 } 328 }
355 329
356 static int audit_compare_gid(kgid_t gid, 330 static int audit_compare_gid(kgid_t gid,
357 struct audit_name 331 struct audit_names *name,
358 struct audit_fiel 332 struct audit_field *f,
359 struct audit_cont 333 struct audit_context *ctx)
360 { 334 {
361 struct audit_names *n; 335 struct audit_names *n;
362 int rc; 336 int rc;
363 !! 337
364 if (name) { 338 if (name) {
365 rc = audit_gid_comparator(gid, 339 rc = audit_gid_comparator(gid, f->op, name->gid);
366 if (rc) 340 if (rc)
367 return rc; 341 return rc;
368 } 342 }
369 !! 343
370 if (ctx) { 344 if (ctx) {
371 list_for_each_entry(n, &ctx->n 345 list_for_each_entry(n, &ctx->names_list, list) {
372 rc = audit_gid_compara 346 rc = audit_gid_comparator(gid, f->op, n->gid);
373 if (rc) 347 if (rc)
374 return rc; 348 return rc;
375 } 349 }
376 } 350 }
377 return 0; 351 return 0;
378 } 352 }
379 353
380 static int audit_field_compare(struct task_str 354 static int audit_field_compare(struct task_struct *tsk,
381 const struct cr 355 const struct cred *cred,
382 struct audit_fi 356 struct audit_field *f,
383 struct audit_co 357 struct audit_context *ctx,
384 struct audit_na 358 struct audit_names *name)
385 { 359 {
386 switch (f->val) { 360 switch (f->val) {
387 /* process to file object comparisons 361 /* process to file object comparisons */
388 case AUDIT_COMPARE_UID_TO_OBJ_UID: 362 case AUDIT_COMPARE_UID_TO_OBJ_UID:
389 return audit_compare_uid(cred- 363 return audit_compare_uid(cred->uid, name, f, ctx);
390 case AUDIT_COMPARE_GID_TO_OBJ_GID: 364 case AUDIT_COMPARE_GID_TO_OBJ_GID:
391 return audit_compare_gid(cred- 365 return audit_compare_gid(cred->gid, name, f, ctx);
392 case AUDIT_COMPARE_EUID_TO_OBJ_UID: 366 case AUDIT_COMPARE_EUID_TO_OBJ_UID:
393 return audit_compare_uid(cred- 367 return audit_compare_uid(cred->euid, name, f, ctx);
394 case AUDIT_COMPARE_EGID_TO_OBJ_GID: 368 case AUDIT_COMPARE_EGID_TO_OBJ_GID:
395 return audit_compare_gid(cred- 369 return audit_compare_gid(cred->egid, name, f, ctx);
396 case AUDIT_COMPARE_AUID_TO_OBJ_UID: 370 case AUDIT_COMPARE_AUID_TO_OBJ_UID:
397 return audit_compare_uid(audit 371 return audit_compare_uid(audit_get_loginuid(tsk), name, f, ctx);
398 case AUDIT_COMPARE_SUID_TO_OBJ_UID: 372 case AUDIT_COMPARE_SUID_TO_OBJ_UID:
399 return audit_compare_uid(cred- 373 return audit_compare_uid(cred->suid, name, f, ctx);
400 case AUDIT_COMPARE_SGID_TO_OBJ_GID: 374 case AUDIT_COMPARE_SGID_TO_OBJ_GID:
401 return audit_compare_gid(cred- 375 return audit_compare_gid(cred->sgid, name, f, ctx);
402 case AUDIT_COMPARE_FSUID_TO_OBJ_UID: 376 case AUDIT_COMPARE_FSUID_TO_OBJ_UID:
403 return audit_compare_uid(cred- 377 return audit_compare_uid(cred->fsuid, name, f, ctx);
404 case AUDIT_COMPARE_FSGID_TO_OBJ_GID: 378 case AUDIT_COMPARE_FSGID_TO_OBJ_GID:
405 return audit_compare_gid(cred- 379 return audit_compare_gid(cred->fsgid, name, f, ctx);
406 /* uid comparisons */ 380 /* uid comparisons */
407 case AUDIT_COMPARE_UID_TO_AUID: 381 case AUDIT_COMPARE_UID_TO_AUID:
408 return audit_uid_comparator(cr 382 return audit_uid_comparator(cred->uid, f->op,
409 au 383 audit_get_loginuid(tsk));
410 case AUDIT_COMPARE_UID_TO_EUID: 384 case AUDIT_COMPARE_UID_TO_EUID:
411 return audit_uid_comparator(cr 385 return audit_uid_comparator(cred->uid, f->op, cred->euid);
412 case AUDIT_COMPARE_UID_TO_SUID: 386 case AUDIT_COMPARE_UID_TO_SUID:
413 return audit_uid_comparator(cr 387 return audit_uid_comparator(cred->uid, f->op, cred->suid);
414 case AUDIT_COMPARE_UID_TO_FSUID: 388 case AUDIT_COMPARE_UID_TO_FSUID:
415 return audit_uid_comparator(cr 389 return audit_uid_comparator(cred->uid, f->op, cred->fsuid);
416 /* auid comparisons */ 390 /* auid comparisons */
417 case AUDIT_COMPARE_AUID_TO_EUID: 391 case AUDIT_COMPARE_AUID_TO_EUID:
418 return audit_uid_comparator(au 392 return audit_uid_comparator(audit_get_loginuid(tsk), f->op,
419 cr 393 cred->euid);
420 case AUDIT_COMPARE_AUID_TO_SUID: 394 case AUDIT_COMPARE_AUID_TO_SUID:
421 return audit_uid_comparator(au 395 return audit_uid_comparator(audit_get_loginuid(tsk), f->op,
422 cr 396 cred->suid);
423 case AUDIT_COMPARE_AUID_TO_FSUID: 397 case AUDIT_COMPARE_AUID_TO_FSUID:
424 return audit_uid_comparator(au 398 return audit_uid_comparator(audit_get_loginuid(tsk), f->op,
425 cr 399 cred->fsuid);
426 /* euid comparisons */ 400 /* euid comparisons */
427 case AUDIT_COMPARE_EUID_TO_SUID: 401 case AUDIT_COMPARE_EUID_TO_SUID:
428 return audit_uid_comparator(cr 402 return audit_uid_comparator(cred->euid, f->op, cred->suid);
429 case AUDIT_COMPARE_EUID_TO_FSUID: 403 case AUDIT_COMPARE_EUID_TO_FSUID:
430 return audit_uid_comparator(cr 404 return audit_uid_comparator(cred->euid, f->op, cred->fsuid);
431 /* suid comparisons */ 405 /* suid comparisons */
432 case AUDIT_COMPARE_SUID_TO_FSUID: 406 case AUDIT_COMPARE_SUID_TO_FSUID:
433 return audit_uid_comparator(cr 407 return audit_uid_comparator(cred->suid, f->op, cred->fsuid);
434 /* gid comparisons */ 408 /* gid comparisons */
435 case AUDIT_COMPARE_GID_TO_EGID: 409 case AUDIT_COMPARE_GID_TO_EGID:
436 return audit_gid_comparator(cr 410 return audit_gid_comparator(cred->gid, f->op, cred->egid);
437 case AUDIT_COMPARE_GID_TO_SGID: 411 case AUDIT_COMPARE_GID_TO_SGID:
438 return audit_gid_comparator(cr 412 return audit_gid_comparator(cred->gid, f->op, cred->sgid);
439 case AUDIT_COMPARE_GID_TO_FSGID: 413 case AUDIT_COMPARE_GID_TO_FSGID:
440 return audit_gid_comparator(cr 414 return audit_gid_comparator(cred->gid, f->op, cred->fsgid);
441 /* egid comparisons */ 415 /* egid comparisons */
442 case AUDIT_COMPARE_EGID_TO_SGID: 416 case AUDIT_COMPARE_EGID_TO_SGID:
443 return audit_gid_comparator(cr 417 return audit_gid_comparator(cred->egid, f->op, cred->sgid);
444 case AUDIT_COMPARE_EGID_TO_FSGID: 418 case AUDIT_COMPARE_EGID_TO_FSGID:
445 return audit_gid_comparator(cr 419 return audit_gid_comparator(cred->egid, f->op, cred->fsgid);
446 /* sgid comparison */ 420 /* sgid comparison */
447 case AUDIT_COMPARE_SGID_TO_FSGID: 421 case AUDIT_COMPARE_SGID_TO_FSGID:
448 return audit_gid_comparator(cr 422 return audit_gid_comparator(cred->sgid, f->op, cred->fsgid);
449 default: 423 default:
450 WARN(1, "Missing AUDIT_COMPARE 424 WARN(1, "Missing AUDIT_COMPARE define. Report as a bug\n");
451 return 0; 425 return 0;
452 } 426 }
453 return 0; 427 return 0;
454 } 428 }
455 429
456 /* Determine if any context name data matches 430 /* Determine if any context name data matches a rule's watch data */
457 /* Compare a task_struct with an audit_rule. 431 /* Compare a task_struct with an audit_rule. Return 1 on match, 0
458 * otherwise. 432 * otherwise.
459 * 433 *
460 * If task_creation is true, this is an explic 434 * If task_creation is true, this is an explicit indication that we are
461 * filtering a task rule at task creation time 435 * filtering a task rule at task creation time. This and tsk == current are
462 * the only situations where tsk->cred may be 436 * the only situations where tsk->cred may be accessed without an rcu read lock.
463 */ 437 */
464 static int audit_filter_rules(struct task_stru 438 static int audit_filter_rules(struct task_struct *tsk,
465 struct audit_kru 439 struct audit_krule *rule,
466 struct audit_con 440 struct audit_context *ctx,
467 struct audit_nam 441 struct audit_names *name,
468 enum audit_state 442 enum audit_state *state,
469 bool task_creati 443 bool task_creation)
470 { 444 {
471 const struct cred *cred; 445 const struct cred *cred;
472 int i, need_sid = 1; 446 int i, need_sid = 1;
473 u32 sid; 447 u32 sid;
474 unsigned int sessionid; 448 unsigned int sessionid;
475 449
476 if (ctx && rule->prio <= ctx->prio) <<
477 return 0; <<
478 <<
479 cred = rcu_dereference_check(tsk->cred 450 cred = rcu_dereference_check(tsk->cred, tsk == current || task_creation);
480 451
481 for (i = 0; i < rule->field_count; i++ 452 for (i = 0; i < rule->field_count; i++) {
482 struct audit_field *f = &rule- 453 struct audit_field *f = &rule->fields[i];
483 struct audit_names *n; 454 struct audit_names *n;
484 int result = 0; 455 int result = 0;
485 pid_t pid; 456 pid_t pid;
486 457
487 switch (f->type) { 458 switch (f->type) {
488 case AUDIT_PID: 459 case AUDIT_PID:
489 pid = task_tgid_nr(tsk 460 pid = task_tgid_nr(tsk);
490 result = audit_compara 461 result = audit_comparator(pid, f->op, f->val);
491 break; 462 break;
492 case AUDIT_PPID: 463 case AUDIT_PPID:
493 if (ctx) { 464 if (ctx) {
494 if (!ctx->ppid 465 if (!ctx->ppid)
495 ctx->p 466 ctx->ppid = task_ppid_nr(tsk);
496 result = audit 467 result = audit_comparator(ctx->ppid, f->op, f->val);
497 } 468 }
498 break; 469 break;
499 case AUDIT_EXE: 470 case AUDIT_EXE:
500 result = audit_exe_com 471 result = audit_exe_compare(tsk, rule->exe);
501 if (f->op == Audit_not 472 if (f->op == Audit_not_equal)
502 result = !resu 473 result = !result;
503 break; 474 break;
504 case AUDIT_UID: 475 case AUDIT_UID:
505 result = audit_uid_com 476 result = audit_uid_comparator(cred->uid, f->op, f->uid);
506 break; 477 break;
507 case AUDIT_EUID: 478 case AUDIT_EUID:
508 result = audit_uid_com 479 result = audit_uid_comparator(cred->euid, f->op, f->uid);
509 break; 480 break;
510 case AUDIT_SUID: 481 case AUDIT_SUID:
511 result = audit_uid_com 482 result = audit_uid_comparator(cred->suid, f->op, f->uid);
512 break; 483 break;
513 case AUDIT_FSUID: 484 case AUDIT_FSUID:
514 result = audit_uid_com 485 result = audit_uid_comparator(cred->fsuid, f->op, f->uid);
515 break; 486 break;
516 case AUDIT_GID: 487 case AUDIT_GID:
517 result = audit_gid_com 488 result = audit_gid_comparator(cred->gid, f->op, f->gid);
518 if (f->op == Audit_equ 489 if (f->op == Audit_equal) {
519 if (!result) 490 if (!result)
520 result 491 result = groups_search(cred->group_info, f->gid);
521 } else if (f->op == Au 492 } else if (f->op == Audit_not_equal) {
522 if (result) 493 if (result)
523 result 494 result = !groups_search(cred->group_info, f->gid);
524 } 495 }
525 break; 496 break;
526 case AUDIT_EGID: 497 case AUDIT_EGID:
527 result = audit_gid_com 498 result = audit_gid_comparator(cred->egid, f->op, f->gid);
528 if (f->op == Audit_equ 499 if (f->op == Audit_equal) {
529 if (!result) 500 if (!result)
530 result 501 result = groups_search(cred->group_info, f->gid);
531 } else if (f->op == Au 502 } else if (f->op == Audit_not_equal) {
532 if (result) 503 if (result)
533 result 504 result = !groups_search(cred->group_info, f->gid);
534 } 505 }
535 break; 506 break;
536 case AUDIT_SGID: 507 case AUDIT_SGID:
537 result = audit_gid_com 508 result = audit_gid_comparator(cred->sgid, f->op, f->gid);
538 break; 509 break;
539 case AUDIT_FSGID: 510 case AUDIT_FSGID:
540 result = audit_gid_com 511 result = audit_gid_comparator(cred->fsgid, f->op, f->gid);
541 break; 512 break;
542 case AUDIT_SESSIONID: 513 case AUDIT_SESSIONID:
543 sessionid = audit_get_ 514 sessionid = audit_get_sessionid(tsk);
544 result = audit_compara 515 result = audit_comparator(sessionid, f->op, f->val);
545 break; 516 break;
546 case AUDIT_PERS: 517 case AUDIT_PERS:
547 result = audit_compara 518 result = audit_comparator(tsk->personality, f->op, f->val);
548 break; 519 break;
549 case AUDIT_ARCH: 520 case AUDIT_ARCH:
550 if (ctx) 521 if (ctx)
551 result = audit 522 result = audit_comparator(ctx->arch, f->op, f->val);
552 break; 523 break;
553 524
554 case AUDIT_EXIT: 525 case AUDIT_EXIT:
555 if (ctx && ctx->return !! 526 if (ctx && ctx->return_valid)
556 result = audit 527 result = audit_comparator(ctx->return_code, f->op, f->val);
557 break; 528 break;
558 case AUDIT_SUCCESS: 529 case AUDIT_SUCCESS:
559 if (ctx && ctx->return !! 530 if (ctx && ctx->return_valid) {
560 if (f->val) 531 if (f->val)
561 result 532 result = audit_comparator(ctx->return_valid, f->op, AUDITSC_SUCCESS);
562 else 533 else
563 result 534 result = audit_comparator(ctx->return_valid, f->op, AUDITSC_FAILURE);
564 } 535 }
565 break; 536 break;
566 case AUDIT_DEVMAJOR: 537 case AUDIT_DEVMAJOR:
567 if (name) { 538 if (name) {
568 if (audit_comp 539 if (audit_comparator(MAJOR(name->dev), f->op, f->val) ||
569 audit_comp 540 audit_comparator(MAJOR(name->rdev), f->op, f->val))
570 ++resu 541 ++result;
571 } else if (ctx) { 542 } else if (ctx) {
572 list_for_each_ 543 list_for_each_entry(n, &ctx->names_list, list) {
573 if (au 544 if (audit_comparator(MAJOR(n->dev), f->op, f->val) ||
574 au 545 audit_comparator(MAJOR(n->rdev), f->op, f->val)) {
575 546 ++result;
576 547 break;
577 } 548 }
578 } 549 }
579 } 550 }
580 break; 551 break;
581 case AUDIT_DEVMINOR: 552 case AUDIT_DEVMINOR:
582 if (name) { 553 if (name) {
583 if (audit_comp 554 if (audit_comparator(MINOR(name->dev), f->op, f->val) ||
584 audit_comp 555 audit_comparator(MINOR(name->rdev), f->op, f->val))
585 ++resu 556 ++result;
586 } else if (ctx) { 557 } else if (ctx) {
587 list_for_each_ 558 list_for_each_entry(n, &ctx->names_list, list) {
588 if (au 559 if (audit_comparator(MINOR(n->dev), f->op, f->val) ||
589 au 560 audit_comparator(MINOR(n->rdev), f->op, f->val)) {
590 561 ++result;
591 562 break;
592 } 563 }
593 } 564 }
594 } 565 }
595 break; 566 break;
596 case AUDIT_INODE: 567 case AUDIT_INODE:
597 if (name) 568 if (name)
598 result = audit 569 result = audit_comparator(name->ino, f->op, f->val);
599 else if (ctx) { 570 else if (ctx) {
600 list_for_each_ 571 list_for_each_entry(n, &ctx->names_list, list) {
601 if (au 572 if (audit_comparator(n->ino, f->op, f->val)) {
602 573 ++result;
603 574 break;
604 } 575 }
605 } 576 }
606 } 577 }
607 break; 578 break;
608 case AUDIT_OBJ_UID: 579 case AUDIT_OBJ_UID:
609 if (name) { 580 if (name) {
610 result = audit 581 result = audit_uid_comparator(name->uid, f->op, f->uid);
611 } else if (ctx) { 582 } else if (ctx) {
612 list_for_each_ 583 list_for_each_entry(n, &ctx->names_list, list) {
613 if (au 584 if (audit_uid_comparator(n->uid, f->op, f->uid)) {
614 585 ++result;
615 586 break;
616 } 587 }
617 } 588 }
618 } 589 }
619 break; 590 break;
620 case AUDIT_OBJ_GID: 591 case AUDIT_OBJ_GID:
621 if (name) { 592 if (name) {
622 result = audit 593 result = audit_gid_comparator(name->gid, f->op, f->gid);
623 } else if (ctx) { 594 } else if (ctx) {
624 list_for_each_ 595 list_for_each_entry(n, &ctx->names_list, list) {
625 if (au 596 if (audit_gid_comparator(n->gid, f->op, f->gid)) {
626 597 ++result;
627 598 break;
628 } 599 }
629 } 600 }
630 } 601 }
631 break; 602 break;
632 case AUDIT_WATCH: 603 case AUDIT_WATCH:
633 if (name) { 604 if (name) {
634 result = audit 605 result = audit_watch_compare(rule->watch,
635 606 name->ino,
636 607 name->dev);
637 if (f->op == A 608 if (f->op == Audit_not_equal)
638 result 609 result = !result;
639 } 610 }
640 break; 611 break;
641 case AUDIT_DIR: 612 case AUDIT_DIR:
642 if (ctx) { 613 if (ctx) {
643 result = match 614 result = match_tree_refs(ctx, rule->tree);
644 if (f->op == A 615 if (f->op == Audit_not_equal)
645 result 616 result = !result;
646 } 617 }
647 break; 618 break;
648 case AUDIT_LOGINUID: 619 case AUDIT_LOGINUID:
649 result = audit_uid_com 620 result = audit_uid_comparator(audit_get_loginuid(tsk),
650 621 f->op, f->uid);
651 break; 622 break;
652 case AUDIT_LOGINUID_SET: 623 case AUDIT_LOGINUID_SET:
653 result = audit_compara 624 result = audit_comparator(audit_loginuid_set(tsk), f->op, f->val);
654 break; 625 break;
655 case AUDIT_SADDR_FAM: 626 case AUDIT_SADDR_FAM:
656 if (ctx && ctx->sockad !! 627 if (ctx->sockaddr)
657 result = audit 628 result = audit_comparator(ctx->sockaddr->ss_family,
658 629 f->op, f->val);
659 break; 630 break;
660 case AUDIT_SUBJ_USER: 631 case AUDIT_SUBJ_USER:
661 case AUDIT_SUBJ_ROLE: 632 case AUDIT_SUBJ_ROLE:
662 case AUDIT_SUBJ_TYPE: 633 case AUDIT_SUBJ_TYPE:
663 case AUDIT_SUBJ_SEN: 634 case AUDIT_SUBJ_SEN:
664 case AUDIT_SUBJ_CLR: 635 case AUDIT_SUBJ_CLR:
665 /* NOTE: this may retu 636 /* NOTE: this may return negative values indicating
666 a temporary error. 637 a temporary error. We simply treat this as a
667 match for now to av 638 match for now to avoid losing information that
668 may be wanted. An 639 may be wanted. An error message will also be
669 logged upon error * 640 logged upon error */
670 if (f->lsm_rule) { 641 if (f->lsm_rule) {
671 if (need_sid) 642 if (need_sid) {
672 /* @ts !! 643 security_task_getsecid(tsk, &sid);
673 * @cu <<
674 * for <<
675 * the <<
676 * of <<
677 * use <<
678 * her <<
679 * @cu <<
680 */ <<
681 securi <<
682 need_s 644 need_sid = 0;
683 } 645 }
684 result = secur 646 result = security_audit_rule_match(sid, f->type,
685 647 f->op,
686 648 f->lsm_rule);
687 } 649 }
688 break; 650 break;
689 case AUDIT_OBJ_USER: 651 case AUDIT_OBJ_USER:
690 case AUDIT_OBJ_ROLE: 652 case AUDIT_OBJ_ROLE:
691 case AUDIT_OBJ_TYPE: 653 case AUDIT_OBJ_TYPE:
692 case AUDIT_OBJ_LEV_LOW: 654 case AUDIT_OBJ_LEV_LOW:
693 case AUDIT_OBJ_LEV_HIGH: 655 case AUDIT_OBJ_LEV_HIGH:
694 /* The above note for 656 /* The above note for AUDIT_SUBJ_USER...AUDIT_SUBJ_CLR
695 also applies here * 657 also applies here */
696 if (f->lsm_rule) { 658 if (f->lsm_rule) {
697 /* Find files 659 /* Find files that match */
698 if (name) { 660 if (name) {
699 result 661 result = security_audit_rule_match(
700 662 name->osid,
701 663 f->type,
702 664 f->op,
703 665 f->lsm_rule);
704 } else if (ctx 666 } else if (ctx) {
705 list_f 667 list_for_each_entry(n, &ctx->names_list, list) {
706 668 if (security_audit_rule_match(
707 669 n->osid,
708 670 f->type,
709 671 f->op,
710 672 f->lsm_rule)) {
711 673 ++result;
712 674 break;
713 675 }
714 } 676 }
715 } 677 }
716 /* Find ipc ob 678 /* Find ipc objects that match */
717 if (!ctx || ct 679 if (!ctx || ctx->type != AUDIT_IPC)
718 break; 680 break;
719 if (security_a 681 if (security_audit_rule_match(ctx->ipc.osid,
720 682 f->type, f->op,
721 683 f->lsm_rule))
722 ++resu 684 ++result;
723 } 685 }
724 break; 686 break;
725 case AUDIT_ARG0: 687 case AUDIT_ARG0:
726 case AUDIT_ARG1: 688 case AUDIT_ARG1:
727 case AUDIT_ARG2: 689 case AUDIT_ARG2:
728 case AUDIT_ARG3: 690 case AUDIT_ARG3:
729 if (ctx) 691 if (ctx)
730 result = audit 692 result = audit_comparator(ctx->argv[f->type-AUDIT_ARG0], f->op, f->val);
731 break; 693 break;
732 case AUDIT_FILTERKEY: 694 case AUDIT_FILTERKEY:
733 /* ignore this field f 695 /* ignore this field for filtering */
734 result = 1; 696 result = 1;
735 break; 697 break;
736 case AUDIT_PERM: 698 case AUDIT_PERM:
737 result = audit_match_p 699 result = audit_match_perm(ctx, f->val);
738 if (f->op == Audit_not 700 if (f->op == Audit_not_equal)
739 result = !resu 701 result = !result;
740 break; 702 break;
741 case AUDIT_FILETYPE: 703 case AUDIT_FILETYPE:
742 result = audit_match_f 704 result = audit_match_filetype(ctx, f->val);
743 if (f->op == Audit_not 705 if (f->op == Audit_not_equal)
744 result = !resu 706 result = !result;
745 break; 707 break;
746 case AUDIT_FIELD_COMPARE: 708 case AUDIT_FIELD_COMPARE:
747 result = audit_field_c 709 result = audit_field_compare(tsk, cred, f, ctx, name);
748 break; 710 break;
749 } 711 }
750 if (!result) 712 if (!result)
751 return 0; 713 return 0;
752 } 714 }
753 715
754 if (ctx) { 716 if (ctx) {
>> 717 if (rule->prio <= ctx->prio)
>> 718 return 0;
755 if (rule->filterkey) { 719 if (rule->filterkey) {
756 kfree(ctx->filterkey); 720 kfree(ctx->filterkey);
757 ctx->filterkey = kstrd 721 ctx->filterkey = kstrdup(rule->filterkey, GFP_ATOMIC);
758 } 722 }
759 ctx->prio = rule->prio; 723 ctx->prio = rule->prio;
760 } 724 }
761 switch (rule->action) { 725 switch (rule->action) {
762 case AUDIT_NEVER: 726 case AUDIT_NEVER:
763 *state = AUDIT_STATE_DISABLED; !! 727 *state = AUDIT_DISABLED;
764 break; 728 break;
765 case AUDIT_ALWAYS: 729 case AUDIT_ALWAYS:
766 *state = AUDIT_STATE_RECORD; !! 730 *state = AUDIT_RECORD_CONTEXT;
767 break; 731 break;
768 } 732 }
769 return 1; 733 return 1;
770 } 734 }
771 735
772 /* At process creation time, we can determine 736 /* At process creation time, we can determine if system-call auditing is
773 * completely disabled for this task. Since w 737 * completely disabled for this task. Since we only have the task
774 * structure at this point, we can only check 738 * structure at this point, we can only check uid and gid.
775 */ 739 */
776 static enum audit_state audit_filter_task(stru 740 static enum audit_state audit_filter_task(struct task_struct *tsk, char **key)
777 { 741 {
778 struct audit_entry *e; 742 struct audit_entry *e;
779 enum audit_state state; 743 enum audit_state state;
780 744
781 rcu_read_lock(); 745 rcu_read_lock();
782 list_for_each_entry_rcu(e, &audit_filt 746 list_for_each_entry_rcu(e, &audit_filter_list[AUDIT_FILTER_TASK], list) {
783 if (audit_filter_rules(tsk, &e 747 if (audit_filter_rules(tsk, &e->rule, NULL, NULL,
784 &state, 748 &state, true)) {
785 if (state == AUDIT_STA !! 749 if (state == AUDIT_RECORD_CONTEXT)
786 *key = kstrdup 750 *key = kstrdup(e->rule.filterkey, GFP_ATOMIC);
787 rcu_read_unlock(); 751 rcu_read_unlock();
788 return state; 752 return state;
789 } 753 }
790 } 754 }
791 rcu_read_unlock(); 755 rcu_read_unlock();
792 return AUDIT_STATE_BUILD; !! 756 return AUDIT_BUILD_CONTEXT;
793 } 757 }
794 758
795 static int audit_in_mask(const struct audit_kr 759 static int audit_in_mask(const struct audit_krule *rule, unsigned long val)
796 { 760 {
797 int word, bit; 761 int word, bit;
798 762
799 if (val > 0xffffffff) 763 if (val > 0xffffffff)
800 return false; 764 return false;
801 765
802 word = AUDIT_WORD(val); 766 word = AUDIT_WORD(val);
803 if (word >= AUDIT_BITMASK_SIZE) 767 if (word >= AUDIT_BITMASK_SIZE)
804 return false; 768 return false;
805 769
806 bit = AUDIT_BIT(val); 770 bit = AUDIT_BIT(val);
807 771
808 return rule->mask[word] & bit; 772 return rule->mask[word] & bit;
809 } 773 }
810 774
811 /** !! 775 /* At syscall entry and exit time, this filter is called if the
812 * __audit_filter_op - common filter helper fo !! 776 * audit_state is not low enough that auditing cannot take place, but is
813 * @tsk: associated task !! 777 * also not high enough that we already know we have to write an audit
814 * @ctx: audit context !! 778 * record (i.e., the state is AUDIT_SETUP_CONTEXT or AUDIT_BUILD_CONTEXT).
815 * @list: audit filter list !! 779 */
816 * @name: audit_name (can be NULL) !! 780 static enum audit_state audit_filter_syscall(struct task_struct *tsk,
817 * @op: current syscall/uring_op !! 781 struct audit_context *ctx,
818 * !! 782 struct list_head *list)
819 * Run the udit filters specified in @list aga <<
820 * @name, and @op, as necessary; the caller is <<
821 * that the call is made while the RCU read lo <<
822 * parameter can be NULL, but all others must <<
823 * Returns 1/true if the filter finds a match, <<
824 */ <<
825 static int __audit_filter_op(struct task_struc <<
826 struct audit_contex <<
827 struct list_head *l <<
828 struct audit_names <<
829 unsigned long op) <<
830 { 783 {
831 struct audit_entry *e; 784 struct audit_entry *e;
832 enum audit_state state; 785 enum audit_state state;
833 786
>> 787 if (auditd_test_task(tsk))
>> 788 return AUDIT_DISABLED;
>> 789
>> 790 rcu_read_lock();
834 list_for_each_entry_rcu(e, list, list) 791 list_for_each_entry_rcu(e, list, list) {
835 if (audit_in_mask(&e->rule, op !! 792 if (audit_in_mask(&e->rule, ctx->major) &&
836 audit_filter_rules(tsk, &e !! 793 audit_filter_rules(tsk, &e->rule, ctx, NULL,
837 &state, 794 &state, false)) {
>> 795 rcu_read_unlock();
838 ctx->current_state = s 796 ctx->current_state = state;
839 return 1; !! 797 return state;
840 } 798 }
841 } 799 }
842 return 0; <<
843 } <<
844 <<
845 /** <<
846 * audit_filter_uring - apply filters to an io <<
847 * @tsk: associated task <<
848 * @ctx: audit context <<
849 */ <<
850 static void audit_filter_uring(struct task_str <<
851 struct audit_co <<
852 { <<
853 if (auditd_test_task(tsk)) <<
854 return; <<
855 <<
856 rcu_read_lock(); <<
857 __audit_filter_op(tsk, ctx, &audit_fil <<
858 NULL, ctx->uring_op); <<
859 rcu_read_unlock(); <<
860 } <<
861 <<
862 /* At syscall exit time, this filter is called <<
863 * not low enough that auditing cannot take pl <<
864 * high enough that we already know we have to <<
865 * (i.e., the state is AUDIT_STATE_BUILD). <<
866 */ <<
867 static void audit_filter_syscall(struct task_s <<
868 struct audit_ <<
869 { <<
870 if (auditd_test_task(tsk)) <<
871 return; <<
872 <<
873 rcu_read_lock(); <<
874 __audit_filter_op(tsk, ctx, &audit_fil <<
875 NULL, ctx->major); <<
876 rcu_read_unlock(); 800 rcu_read_unlock();
>> 801 return AUDIT_BUILD_CONTEXT;
877 } 802 }
878 803
879 /* 804 /*
880 * Given an audit_name check the inode hash ta 805 * Given an audit_name check the inode hash table to see if they match.
881 * Called holding the rcu read lock to protect 806 * Called holding the rcu read lock to protect the use of audit_inode_hash
882 */ 807 */
883 static int audit_filter_inode_name(struct task 808 static int audit_filter_inode_name(struct task_struct *tsk,
884 struct audi 809 struct audit_names *n,
885 struct audi !! 810 struct audit_context *ctx) {
886 { <<
887 int h = audit_hash_ino((u32)n->ino); 811 int h = audit_hash_ino((u32)n->ino);
888 struct list_head *list = &audit_inode_ 812 struct list_head *list = &audit_inode_hash[h];
>> 813 struct audit_entry *e;
>> 814 enum audit_state state;
889 815
890 return __audit_filter_op(tsk, ctx, lis !! 816 list_for_each_entry_rcu(e, list, list) {
>> 817 if (audit_in_mask(&e->rule, ctx->major) &&
>> 818 audit_filter_rules(tsk, &e->rule, ctx, n, &state, false)) {
>> 819 ctx->current_state = state;
>> 820 return 1;
>> 821 }
>> 822 }
>> 823 return 0;
891 } 824 }
892 825
893 /* At syscall exit time, this filter is called 826 /* At syscall exit time, this filter is called if any audit_names have been
894 * collected during syscall processing. We on 827 * collected during syscall processing. We only check rules in sublists at hash
895 * buckets applicable to the inode numbers in 828 * buckets applicable to the inode numbers in audit_names.
896 * Regarding audit_state, same rules apply as 829 * Regarding audit_state, same rules apply as for audit_filter_syscall().
897 */ 830 */
898 void audit_filter_inodes(struct task_struct *t 831 void audit_filter_inodes(struct task_struct *tsk, struct audit_context *ctx)
899 { 832 {
900 struct audit_names *n; 833 struct audit_names *n;
901 834
902 if (auditd_test_task(tsk)) 835 if (auditd_test_task(tsk))
903 return; 836 return;
904 837
905 rcu_read_lock(); 838 rcu_read_lock();
906 839
907 list_for_each_entry(n, &ctx->names_lis 840 list_for_each_entry(n, &ctx->names_list, list) {
908 if (audit_filter_inode_name(ts 841 if (audit_filter_inode_name(tsk, n, ctx))
909 break; 842 break;
910 } 843 }
911 rcu_read_unlock(); 844 rcu_read_unlock();
912 } 845 }
913 846
914 static inline void audit_proctitle_free(struct 847 static inline void audit_proctitle_free(struct audit_context *context)
915 { 848 {
916 kfree(context->proctitle.value); 849 kfree(context->proctitle.value);
917 context->proctitle.value = NULL; 850 context->proctitle.value = NULL;
918 context->proctitle.len = 0; 851 context->proctitle.len = 0;
919 } 852 }
920 853
921 static inline void audit_free_module(struct au 854 static inline void audit_free_module(struct audit_context *context)
922 { 855 {
923 if (context->type == AUDIT_KERN_MODULE 856 if (context->type == AUDIT_KERN_MODULE) {
924 kfree(context->module.name); 857 kfree(context->module.name);
925 context->module.name = NULL; 858 context->module.name = NULL;
926 } 859 }
927 } 860 }
928 static inline void audit_free_names(struct aud 861 static inline void audit_free_names(struct audit_context *context)
929 { 862 {
930 struct audit_names *n, *next; 863 struct audit_names *n, *next;
931 864
932 list_for_each_entry_safe(n, next, &con 865 list_for_each_entry_safe(n, next, &context->names_list, list) {
933 list_del(&n->list); 866 list_del(&n->list);
934 if (n->name) 867 if (n->name)
935 putname(n->name); 868 putname(n->name);
936 if (n->should_free) 869 if (n->should_free)
937 kfree(n); 870 kfree(n);
938 } 871 }
939 context->name_count = 0; 872 context->name_count = 0;
940 path_put(&context->pwd); 873 path_put(&context->pwd);
941 context->pwd.dentry = NULL; 874 context->pwd.dentry = NULL;
942 context->pwd.mnt = NULL; 875 context->pwd.mnt = NULL;
943 } 876 }
944 877
945 static inline void audit_free_aux(struct audit 878 static inline void audit_free_aux(struct audit_context *context)
946 { 879 {
947 struct audit_aux_data *aux; 880 struct audit_aux_data *aux;
948 881
949 while ((aux = context->aux)) { 882 while ((aux = context->aux)) {
950 context->aux = aux->next; 883 context->aux = aux->next;
951 kfree(aux); 884 kfree(aux);
952 } 885 }
953 context->aux = NULL; <<
954 while ((aux = context->aux_pids)) { 886 while ((aux = context->aux_pids)) {
955 context->aux_pids = aux->next; 887 context->aux_pids = aux->next;
956 kfree(aux); 888 kfree(aux);
957 } 889 }
958 context->aux_pids = NULL; <<
959 } <<
960 <<
961 /** <<
962 * audit_reset_context - reset a audit_context <<
963 * @ctx: the audit_context to reset <<
964 * <<
965 * All fields in the audit_context will be res <<
966 * references held by fields will be dropped, <<
967 * released. When this function returns the a <<
968 * for reuse, so long as the passed context is <<
969 */ <<
970 static void audit_reset_context(struct audit_c <<
971 { <<
972 if (!ctx) <<
973 return; <<
974 <<
975 /* if ctx is non-null, reset the "ctx- <<
976 ctx->context = AUDIT_CTX_UNUSED; <<
977 if (ctx->dummy) <<
978 return; <<
979 <<
980 /* <<
981 * NOTE: It shouldn't matter in what o <<
982 * release them in the order in <<
983 * this gives us some hope of qu <<
984 * resetting the audit_context p <<
985 * <<
986 * Other things worth mentioning <<
987 * - we don't reset "dummy" <<
988 * - we don't reset "state", we <<
989 * - we preserve "filterkey" if <<
990 * - much of this is likely over <<
991 * - we really need to work on i <<
992 */ <<
993 <<
994 ctx->current_state = ctx->state; <<
995 ctx->serial = 0; <<
996 ctx->major = 0; <<
997 ctx->uring_op = 0; <<
998 ctx->ctime = (struct timespec64){ .tv_ <<
999 memset(ctx->argv, 0, sizeof(ctx->argv) <<
1000 ctx->return_code = 0; <<
1001 ctx->prio = (ctx->state == AUDIT_STAT <<
1002 ctx->return_valid = AUDITSC_INVALID; <<
1003 audit_free_names(ctx); <<
1004 if (ctx->state != AUDIT_STATE_RECORD) <<
1005 kfree(ctx->filterkey); <<
1006 ctx->filterkey = NULL; <<
1007 } <<
1008 audit_free_aux(ctx); <<
1009 kfree(ctx->sockaddr); <<
1010 ctx->sockaddr = NULL; <<
1011 ctx->sockaddr_len = 0; <<
1012 ctx->ppid = 0; <<
1013 ctx->uid = ctx->euid = ctx->suid = ct <<
1014 ctx->gid = ctx->egid = ctx->sgid = ct <<
1015 ctx->personality = 0; <<
1016 ctx->arch = 0; <<
1017 ctx->target_pid = 0; <<
1018 ctx->target_auid = ctx->target_uid = <<
1019 ctx->target_sessionid = 0; <<
1020 ctx->target_sid = 0; <<
1021 ctx->target_comm[0] = '\0'; <<
1022 unroll_tree_refs(ctx, NULL, 0); <<
1023 WARN_ON(!list_empty(&ctx->killed_tree <<
1024 audit_free_module(ctx); <<
1025 ctx->fds[0] = -1; <<
1026 ctx->type = 0; /* reset last for audi <<
1027 } 890 }
1028 891
1029 static inline struct audit_context *audit_all 892 static inline struct audit_context *audit_alloc_context(enum audit_state state)
1030 { 893 {
1031 struct audit_context *context; 894 struct audit_context *context;
1032 895
1033 context = kzalloc(sizeof(*context), G 896 context = kzalloc(sizeof(*context), GFP_KERNEL);
1034 if (!context) 897 if (!context)
1035 return NULL; 898 return NULL;
1036 context->context = AUDIT_CTX_UNUSED; <<
1037 context->state = state; 899 context->state = state;
1038 context->prio = state == AUDIT_STATE_ !! 900 context->prio = state == AUDIT_RECORD_CONTEXT ? ~0ULL : 0;
1039 INIT_LIST_HEAD(&context->killed_trees 901 INIT_LIST_HEAD(&context->killed_trees);
1040 INIT_LIST_HEAD(&context->names_list); 902 INIT_LIST_HEAD(&context->names_list);
1041 context->fds[0] = -1; <<
1042 context->return_valid = AUDITSC_INVAL <<
1043 return context; 903 return context;
1044 } 904 }
1045 905
1046 /** 906 /**
1047 * audit_alloc - allocate an audit context bl 907 * audit_alloc - allocate an audit context block for a task
1048 * @tsk: task 908 * @tsk: task
1049 * 909 *
1050 * Filter on the task information and allocat 910 * Filter on the task information and allocate a per-task audit context
1051 * if necessary. Doing so turns on system ca 911 * if necessary. Doing so turns on system call auditing for the
1052 * specified task. This is called from copy_ 912 * specified task. This is called from copy_process, so no lock is
1053 * needed. 913 * needed.
1054 */ 914 */
1055 int audit_alloc(struct task_struct *tsk) 915 int audit_alloc(struct task_struct *tsk)
1056 { 916 {
1057 struct audit_context *context; 917 struct audit_context *context;
1058 enum audit_state state; 918 enum audit_state state;
1059 char *key = NULL; 919 char *key = NULL;
1060 920
1061 if (likely(!audit_ever_enabled)) 921 if (likely(!audit_ever_enabled))
1062 return 0; !! 922 return 0; /* Return if not auditing. */
1063 923
1064 state = audit_filter_task(tsk, &key); 924 state = audit_filter_task(tsk, &key);
1065 if (state == AUDIT_STATE_DISABLED) { !! 925 if (state == AUDIT_DISABLED) {
1066 clear_task_syscall_work(tsk, !! 926 clear_tsk_thread_flag(tsk, TIF_SYSCALL_AUDIT);
1067 return 0; 927 return 0;
1068 } 928 }
1069 929
1070 context = audit_alloc_context(state); !! 930 if (!(context = audit_alloc_context(state))) {
1071 if (!context) { <<
1072 kfree(key); 931 kfree(key);
1073 audit_log_lost("out of memory 932 audit_log_lost("out of memory in audit_alloc");
1074 return -ENOMEM; 933 return -ENOMEM;
1075 } 934 }
1076 context->filterkey = key; 935 context->filterkey = key;
1077 936
1078 audit_set_context(tsk, context); 937 audit_set_context(tsk, context);
1079 set_task_syscall_work(tsk, SYSCALL_AU !! 938 set_tsk_thread_flag(tsk, TIF_SYSCALL_AUDIT);
1080 return 0; 939 return 0;
1081 } 940 }
1082 941
1083 static inline void audit_free_context(struct 942 static inline void audit_free_context(struct audit_context *context)
1084 { 943 {
1085 /* resetting is extra work, but it is !! 944 audit_free_module(context);
1086 audit_reset_context(context); !! 945 audit_free_names(context);
1087 audit_proctitle_free(context); !! 946 unroll_tree_refs(context, NULL, 0);
1088 free_tree_refs(context); 947 free_tree_refs(context);
>> 948 audit_free_aux(context);
1089 kfree(context->filterkey); 949 kfree(context->filterkey);
>> 950 kfree(context->sockaddr);
>> 951 audit_proctitle_free(context);
1090 kfree(context); 952 kfree(context);
1091 } 953 }
1092 954
1093 static int audit_log_pid_context(struct audit 955 static int audit_log_pid_context(struct audit_context *context, pid_t pid,
1094 kuid_t auid, 956 kuid_t auid, kuid_t uid, unsigned int sessionid,
1095 u32 sid, cha 957 u32 sid, char *comm)
1096 { 958 {
1097 struct audit_buffer *ab; 959 struct audit_buffer *ab;
1098 char *ctx = NULL; 960 char *ctx = NULL;
1099 u32 len; 961 u32 len;
1100 int rc = 0; 962 int rc = 0;
1101 963
1102 ab = audit_log_start(context, GFP_KER 964 ab = audit_log_start(context, GFP_KERNEL, AUDIT_OBJ_PID);
1103 if (!ab) 965 if (!ab)
1104 return rc; 966 return rc;
1105 967
1106 audit_log_format(ab, "opid=%d oauid=% 968 audit_log_format(ab, "opid=%d oauid=%d ouid=%d oses=%d", pid,
1107 from_kuid(&init_user 969 from_kuid(&init_user_ns, auid),
1108 from_kuid(&init_user 970 from_kuid(&init_user_ns, uid), sessionid);
1109 if (sid) { 971 if (sid) {
1110 if (security_secid_to_secctx( 972 if (security_secid_to_secctx(sid, &ctx, &len)) {
1111 audit_log_format(ab, 973 audit_log_format(ab, " obj=(none)");
1112 rc = 1; 974 rc = 1;
1113 } else { 975 } else {
1114 audit_log_format(ab, 976 audit_log_format(ab, " obj=%s", ctx);
1115 security_release_secc 977 security_release_secctx(ctx, len);
1116 } 978 }
1117 } 979 }
1118 audit_log_format(ab, " ocomm="); 980 audit_log_format(ab, " ocomm=");
1119 audit_log_untrustedstring(ab, comm); 981 audit_log_untrustedstring(ab, comm);
1120 audit_log_end(ab); 982 audit_log_end(ab);
1121 983
1122 return rc; 984 return rc;
1123 } 985 }
1124 986
1125 static void audit_log_execve_info(struct audi 987 static void audit_log_execve_info(struct audit_context *context,
1126 struct audi 988 struct audit_buffer **ab)
1127 { 989 {
1128 long len_max; 990 long len_max;
1129 long len_rem; 991 long len_rem;
1130 long len_full; 992 long len_full;
1131 long len_buf; 993 long len_buf;
1132 long len_abuf = 0; 994 long len_abuf = 0;
1133 long len_tmp; 995 long len_tmp;
1134 bool require_data; 996 bool require_data;
1135 bool encode; 997 bool encode;
1136 unsigned int iter; 998 unsigned int iter;
1137 unsigned int arg; 999 unsigned int arg;
1138 char *buf_head; 1000 char *buf_head;
1139 char *buf; 1001 char *buf;
1140 const char __user *p = (const char __ 1002 const char __user *p = (const char __user *)current->mm->arg_start;
1141 1003
1142 /* NOTE: this buffer needs to be larg 1004 /* NOTE: this buffer needs to be large enough to hold all the non-arg
1143 * data we put in the audit rec 1005 * data we put in the audit record for this argument (see the
1144 * code below) ... at this poin 1006 * code below) ... at this point in time 96 is plenty */
1145 char abuf[96]; 1007 char abuf[96];
1146 1008
1147 /* NOTE: we set MAX_EXECVE_AUDIT_LEN 1009 /* NOTE: we set MAX_EXECVE_AUDIT_LEN to a rather arbitrary limit, the
1148 * current value of 7500 is not 1010 * current value of 7500 is not as important as the fact that it
1149 * is less than 8k, a setting o 1011 * is less than 8k, a setting of 7500 gives us plenty of wiggle
1150 * room if we go over a little 1012 * room if we go over a little bit in the logging below */
1151 WARN_ON_ONCE(MAX_EXECVE_AUDIT_LEN > 7 1013 WARN_ON_ONCE(MAX_EXECVE_AUDIT_LEN > 7500);
1152 len_max = MAX_EXECVE_AUDIT_LEN; 1014 len_max = MAX_EXECVE_AUDIT_LEN;
1153 1015
1154 /* scratch buffer to hold the userspa 1016 /* scratch buffer to hold the userspace args */
1155 buf_head = kmalloc(MAX_EXECVE_AUDIT_L 1017 buf_head = kmalloc(MAX_EXECVE_AUDIT_LEN + 1, GFP_KERNEL);
1156 if (!buf_head) { 1018 if (!buf_head) {
1157 audit_panic("out of memory fo 1019 audit_panic("out of memory for argv string");
1158 return; 1020 return;
1159 } 1021 }
1160 buf = buf_head; 1022 buf = buf_head;
1161 1023
1162 audit_log_format(*ab, "argc=%d", cont 1024 audit_log_format(*ab, "argc=%d", context->execve.argc);
1163 1025
1164 len_rem = len_max; 1026 len_rem = len_max;
1165 len_buf = 0; 1027 len_buf = 0;
1166 len_full = 0; 1028 len_full = 0;
1167 require_data = true; 1029 require_data = true;
1168 encode = false; 1030 encode = false;
1169 iter = 0; 1031 iter = 0;
1170 arg = 0; 1032 arg = 0;
1171 do { 1033 do {
1172 /* NOTE: we don't ever want t 1034 /* NOTE: we don't ever want to trust this value for anything
1173 * serious, but the aud 1035 * serious, but the audit record format insists we
1174 * provide an argument 1036 * provide an argument length for really long arguments,
1175 * e.g. > MAX_EXECVE_AU 1037 * e.g. > MAX_EXECVE_AUDIT_LEN, so we have no choice but
1176 * to use strncpy_from_ 1038 * to use strncpy_from_user() to obtain this value for
1177 * recording in the log 1039 * recording in the log, although we don't use it
1178 * anywhere here to avo 1040 * anywhere here to avoid a double-fetch problem */
1179 if (len_full == 0) 1041 if (len_full == 0)
1180 len_full = strnlen_us 1042 len_full = strnlen_user(p, MAX_ARG_STRLEN) - 1;
1181 1043
1182 /* read more data from usersp 1044 /* read more data from userspace */
1183 if (require_data) { 1045 if (require_data) {
1184 /* can we make more r 1046 /* can we make more room in the buffer? */
1185 if (buf != buf_head) 1047 if (buf != buf_head) {
1186 memmove(buf_h 1048 memmove(buf_head, buf, len_buf);
1187 buf = buf_hea 1049 buf = buf_head;
1188 } 1050 }
1189 1051
1190 /* fetch as much as w 1052 /* fetch as much as we can of the argument */
1191 len_tmp = strncpy_fro 1053 len_tmp = strncpy_from_user(&buf_head[len_buf], p,
1192 1054 len_max - len_buf);
1193 if (len_tmp == -EFAUL 1055 if (len_tmp == -EFAULT) {
1194 /* unable to 1056 /* unable to copy from userspace */
1195 send_sig(SIGK 1057 send_sig(SIGKILL, current, 0);
1196 goto out; 1058 goto out;
1197 } else if (len_tmp == 1059 } else if (len_tmp == (len_max - len_buf)) {
1198 /* buffer is 1060 /* buffer is not large enough */
1199 require_data 1061 require_data = true;
1200 /* NOTE: if w 1062 /* NOTE: if we are going to span multiple
1201 * buff 1063 * buffers force the encoding so we stand
1202 * a ch 1064 * a chance at a sane len_full value and
1203 * cons 1065 * consistent record encoding */
1204 encode = true 1066 encode = true;
1205 len_full = le 1067 len_full = len_full * 2;
1206 p += len_tmp; 1068 p += len_tmp;
1207 } else { 1069 } else {
1208 require_data 1070 require_data = false;
1209 if (!encode) 1071 if (!encode)
1210 encod 1072 encode = audit_string_contains_control(
1211 1073 buf, len_tmp);
1212 /* try to use 1074 /* try to use a trusted value for len_full */
1213 if (len_full 1075 if (len_full < len_max)
1214 len_f 1076 len_full = (encode ?
1215 1077 len_tmp * 2 : len_tmp);
1216 p += len_tmp 1078 p += len_tmp + 1;
1217 } 1079 }
1218 len_buf += len_tmp; 1080 len_buf += len_tmp;
1219 buf_head[len_buf] = ' 1081 buf_head[len_buf] = '\0';
1220 1082
1221 /* length of the buff 1083 /* length of the buffer in the audit record? */
1222 len_abuf = (encode ? 1084 len_abuf = (encode ? len_buf * 2 : len_buf + 2);
1223 } 1085 }
1224 1086
1225 /* write as much as we can to 1087 /* write as much as we can to the audit log */
1226 if (len_buf >= 0) { 1088 if (len_buf >= 0) {
1227 /* NOTE: some magic n 1089 /* NOTE: some magic numbers here - basically if we
1228 * can't fit a 1090 * can't fit a reasonable amount of data into the
1229 * existing aud 1091 * existing audit buffer, flush it and start with
1230 * a new buffer 1092 * a new buffer */
1231 if ((sizeof(abuf) + 8 1093 if ((sizeof(abuf) + 8) > len_rem) {
1232 len_rem = len 1094 len_rem = len_max;
1233 audit_log_end 1095 audit_log_end(*ab);
1234 *ab = audit_l 1096 *ab = audit_log_start(context,
1235 1097 GFP_KERNEL, AUDIT_EXECVE);
1236 if (!*ab) 1098 if (!*ab)
1237 goto 1099 goto out;
1238 } 1100 }
1239 1101
1240 /* create the non-arg 1102 /* create the non-arg portion of the arg record */
1241 len_tmp = 0; 1103 len_tmp = 0;
1242 if (require_data || ( 1104 if (require_data || (iter > 0) ||
1243 ((len_abuf + size 1105 ((len_abuf + sizeof(abuf)) > len_rem)) {
1244 if (iter == 0 1106 if (iter == 0) {
1245 len_t 1107 len_tmp += snprintf(&abuf[len_tmp],
1246 1108 sizeof(abuf) - len_tmp,
1247 1109 " a%d_len=%lu",
1248 1110 arg, len_full);
1249 } 1111 }
1250 len_tmp += sn 1112 len_tmp += snprintf(&abuf[len_tmp],
1251 1113 sizeof(abuf) - len_tmp,
1252 1114 " a%d[%d]=", arg, iter++);
1253 } else 1115 } else
1254 len_tmp += sn 1116 len_tmp += snprintf(&abuf[len_tmp],
1255 1117 sizeof(abuf) - len_tmp,
1256 1118 " a%d=", arg);
1257 WARN_ON(len_tmp >= si 1119 WARN_ON(len_tmp >= sizeof(abuf));
1258 abuf[sizeof(abuf) - 1 1120 abuf[sizeof(abuf) - 1] = '\0';
1259 1121
1260 /* log the arg in the 1122 /* log the arg in the audit record */
1261 audit_log_format(*ab, 1123 audit_log_format(*ab, "%s", abuf);
1262 len_rem -= len_tmp; 1124 len_rem -= len_tmp;
1263 len_tmp = len_buf; 1125 len_tmp = len_buf;
1264 if (encode) { 1126 if (encode) {
1265 if (len_abuf 1127 if (len_abuf > len_rem)
1266 len_t 1128 len_tmp = len_rem / 2; /* encoding */
1267 audit_log_n_h 1129 audit_log_n_hex(*ab, buf, len_tmp);
1268 len_rem -= le 1130 len_rem -= len_tmp * 2;
1269 len_abuf -= l 1131 len_abuf -= len_tmp * 2;
1270 } else { 1132 } else {
1271 if (len_abuf 1133 if (len_abuf > len_rem)
1272 len_t 1134 len_tmp = len_rem - 2; /* quotes */
1273 audit_log_n_s 1135 audit_log_n_string(*ab, buf, len_tmp);
1274 len_rem -= le 1136 len_rem -= len_tmp + 2;
1275 /* don't subt 1137 /* don't subtract the "2" because we still need
1276 * to add quo 1138 * to add quotes to the remaining string */
1277 len_abuf -= l 1139 len_abuf -= len_tmp;
1278 } 1140 }
1279 len_buf -= len_tmp; 1141 len_buf -= len_tmp;
1280 buf += len_tmp; 1142 buf += len_tmp;
1281 } 1143 }
1282 1144
1283 /* ready to move to the next 1145 /* ready to move to the next argument? */
1284 if ((len_buf == 0) && !requir 1146 if ((len_buf == 0) && !require_data) {
1285 arg++; 1147 arg++;
1286 iter = 0; 1148 iter = 0;
1287 len_full = 0; 1149 len_full = 0;
1288 require_data = true; 1150 require_data = true;
1289 encode = false; 1151 encode = false;
1290 } 1152 }
1291 } while (arg < context->execve.argc); 1153 } while (arg < context->execve.argc);
1292 1154
1293 /* NOTE: the caller handles the final 1155 /* NOTE: the caller handles the final audit_log_end() call */
1294 1156
1295 out: 1157 out:
1296 kfree(buf_head); 1158 kfree(buf_head);
1297 } 1159 }
1298 1160
1299 static void audit_log_cap(struct audit_buffer 1161 static void audit_log_cap(struct audit_buffer *ab, char *prefix,
1300 kernel_cap_t *cap) 1162 kernel_cap_t *cap)
1301 { 1163 {
>> 1164 int i;
>> 1165
1302 if (cap_isclear(*cap)) { 1166 if (cap_isclear(*cap)) {
1303 audit_log_format(ab, " %s=0", 1167 audit_log_format(ab, " %s=0", prefix);
1304 return; 1168 return;
1305 } 1169 }
1306 audit_log_format(ab, " %s=%016llx", p !! 1170 audit_log_format(ab, " %s=", prefix);
>> 1171 CAP_FOR_EACH_U32(i)
>> 1172 audit_log_format(ab, "%08x", cap->cap[CAP_LAST_U32 - i]);
1307 } 1173 }
1308 1174
1309 static void audit_log_fcaps(struct audit_buff 1175 static void audit_log_fcaps(struct audit_buffer *ab, struct audit_names *name)
1310 { 1176 {
1311 if (name->fcap_ver == -1) { 1177 if (name->fcap_ver == -1) {
1312 audit_log_format(ab, " cap_fe 1178 audit_log_format(ab, " cap_fe=? cap_fver=? cap_fp=? cap_fi=?");
1313 return; 1179 return;
1314 } 1180 }
1315 audit_log_cap(ab, "cap_fp", &name->fc 1181 audit_log_cap(ab, "cap_fp", &name->fcap.permitted);
1316 audit_log_cap(ab, "cap_fi", &name->fc 1182 audit_log_cap(ab, "cap_fi", &name->fcap.inheritable);
1317 audit_log_format(ab, " cap_fe=%d cap_ 1183 audit_log_format(ab, " cap_fe=%d cap_fver=%x cap_frootid=%d",
1318 name->fcap.fE, name- 1184 name->fcap.fE, name->fcap_ver,
1319 from_kuid(&init_user 1185 from_kuid(&init_user_ns, name->fcap.rootid));
1320 } 1186 }
1321 1187
1322 static void audit_log_time(struct audit_conte <<
1323 { <<
1324 const struct audit_ntp_data *ntp = &c <<
1325 const struct timespec64 *tk = &contex <<
1326 static const char * const ntp_name[] <<
1327 "offset", <<
1328 "freq", <<
1329 "status", <<
1330 "tai", <<
1331 "tick", <<
1332 "adjust", <<
1333 }; <<
1334 int type; <<
1335 <<
1336 if (context->type == AUDIT_TIME_ADJNT <<
1337 for (type = 0; type < AUDIT_N <<
1338 if (ntp->vals[type].n <<
1339 if (!*ab) { <<
1340 *ab = <<
1341 <<
1342 <<
1343 if (! <<
1344 <<
1345 } <<
1346 audit_log_for <<
1347 <<
1348 <<
1349 <<
1350 audit_log_end <<
1351 *ab = NULL; <<
1352 } <<
1353 } <<
1354 } <<
1355 if (tk->tv_sec != 0 || tk->tv_nsec != <<
1356 if (!*ab) { <<
1357 *ab = audit_log_start <<
1358 <<
1359 if (!*ab) <<
1360 return; <<
1361 } <<
1362 audit_log_format(*ab, "sec=%l <<
1363 (long long)t <<
1364 audit_log_end(*ab); <<
1365 *ab = NULL; <<
1366 } <<
1367 } <<
1368 <<
1369 static void show_special(struct audit_context 1188 static void show_special(struct audit_context *context, int *call_panic)
1370 { 1189 {
1371 struct audit_buffer *ab; 1190 struct audit_buffer *ab;
1372 int i; 1191 int i;
1373 1192
1374 ab = audit_log_start(context, GFP_KER 1193 ab = audit_log_start(context, GFP_KERNEL, context->type);
1375 if (!ab) 1194 if (!ab)
1376 return; 1195 return;
1377 1196
1378 switch (context->type) { 1197 switch (context->type) {
1379 case AUDIT_SOCKETCALL: { 1198 case AUDIT_SOCKETCALL: {
1380 int nargs = context->socketca 1199 int nargs = context->socketcall.nargs;
1381 <<
1382 audit_log_format(ab, "nargs=% 1200 audit_log_format(ab, "nargs=%d", nargs);
1383 for (i = 0; i < nargs; i++) 1201 for (i = 0; i < nargs; i++)
1384 audit_log_format(ab, 1202 audit_log_format(ab, " a%d=%lx", i,
1385 context->sock 1203 context->socketcall.args[i]);
1386 break; } 1204 break; }
1387 case AUDIT_IPC: { 1205 case AUDIT_IPC: {
1388 u32 osid = context->ipc.osid; 1206 u32 osid = context->ipc.osid;
1389 1207
1390 audit_log_format(ab, "ouid=%u 1208 audit_log_format(ab, "ouid=%u ogid=%u mode=%#ho",
1391 from_kuid(&i 1209 from_kuid(&init_user_ns, context->ipc.uid),
1392 from_kgid(&i 1210 from_kgid(&init_user_ns, context->ipc.gid),
1393 context->ipc 1211 context->ipc.mode);
1394 if (osid) { 1212 if (osid) {
1395 char *ctx = NULL; 1213 char *ctx = NULL;
1396 u32 len; 1214 u32 len;
1397 <<
1398 if (security_secid_to 1215 if (security_secid_to_secctx(osid, &ctx, &len)) {
1399 audit_log_for 1216 audit_log_format(ab, " osid=%u", osid);
1400 *call_panic = 1217 *call_panic = 1;
1401 } else { 1218 } else {
1402 audit_log_for 1219 audit_log_format(ab, " obj=%s", ctx);
1403 security_rele 1220 security_release_secctx(ctx, len);
1404 } 1221 }
1405 } 1222 }
1406 if (context->ipc.has_perm) { 1223 if (context->ipc.has_perm) {
1407 audit_log_end(ab); 1224 audit_log_end(ab);
1408 ab = audit_log_start( 1225 ab = audit_log_start(context, GFP_KERNEL,
1409 1226 AUDIT_IPC_SET_PERM);
1410 if (unlikely(!ab)) 1227 if (unlikely(!ab))
1411 return; 1228 return;
1412 audit_log_format(ab, 1229 audit_log_format(ab,
1413 "qbytes=%lx o 1230 "qbytes=%lx ouid=%u ogid=%u mode=%#ho",
1414 context->ipc. 1231 context->ipc.qbytes,
1415 context->ipc. 1232 context->ipc.perm_uid,
1416 context->ipc. 1233 context->ipc.perm_gid,
1417 context->ipc. 1234 context->ipc.perm_mode);
1418 } 1235 }
1419 break; } 1236 break; }
1420 case AUDIT_MQ_OPEN: 1237 case AUDIT_MQ_OPEN:
1421 audit_log_format(ab, 1238 audit_log_format(ab,
1422 "oflag=0x%x mode=%#ho 1239 "oflag=0x%x mode=%#ho mq_flags=0x%lx mq_maxmsg=%ld "
1423 "mq_msgsize=%ld mq_cu 1240 "mq_msgsize=%ld mq_curmsgs=%ld",
1424 context->mq_open.ofla 1241 context->mq_open.oflag, context->mq_open.mode,
1425 context->mq_open.attr 1242 context->mq_open.attr.mq_flags,
1426 context->mq_open.attr 1243 context->mq_open.attr.mq_maxmsg,
1427 context->mq_open.attr 1244 context->mq_open.attr.mq_msgsize,
1428 context->mq_open.attr 1245 context->mq_open.attr.mq_curmsgs);
1429 break; 1246 break;
1430 case AUDIT_MQ_SENDRECV: 1247 case AUDIT_MQ_SENDRECV:
1431 audit_log_format(ab, 1248 audit_log_format(ab,
1432 "mqdes=%d msg_len=%zd 1249 "mqdes=%d msg_len=%zd msg_prio=%u "
1433 "abs_timeout_sec=%lld 1250 "abs_timeout_sec=%lld abs_timeout_nsec=%ld",
1434 context->mq_sendrecv. 1251 context->mq_sendrecv.mqdes,
1435 context->mq_sendrecv. 1252 context->mq_sendrecv.msg_len,
1436 context->mq_sendrecv. 1253 context->mq_sendrecv.msg_prio,
1437 (long long) context-> 1254 (long long) context->mq_sendrecv.abs_timeout.tv_sec,
1438 context->mq_sendrecv. 1255 context->mq_sendrecv.abs_timeout.tv_nsec);
1439 break; 1256 break;
1440 case AUDIT_MQ_NOTIFY: 1257 case AUDIT_MQ_NOTIFY:
1441 audit_log_format(ab, "mqdes=% 1258 audit_log_format(ab, "mqdes=%d sigev_signo=%d",
1442 context->mq_n 1259 context->mq_notify.mqdes,
1443 context->mq_n 1260 context->mq_notify.sigev_signo);
1444 break; 1261 break;
1445 case AUDIT_MQ_GETSETATTR: { 1262 case AUDIT_MQ_GETSETATTR: {
1446 struct mq_attr *attr = &conte 1263 struct mq_attr *attr = &context->mq_getsetattr.mqstat;
1447 <<
1448 audit_log_format(ab, 1264 audit_log_format(ab,
1449 "mqdes=%d mq_flags=0x 1265 "mqdes=%d mq_flags=0x%lx mq_maxmsg=%ld mq_msgsize=%ld "
1450 "mq_curmsgs=%ld ", 1266 "mq_curmsgs=%ld ",
1451 context->mq_getsetatt 1267 context->mq_getsetattr.mqdes,
1452 attr->mq_flags, attr- 1268 attr->mq_flags, attr->mq_maxmsg,
1453 attr->mq_msgsize, att 1269 attr->mq_msgsize, attr->mq_curmsgs);
1454 break; } 1270 break; }
1455 case AUDIT_CAPSET: 1271 case AUDIT_CAPSET:
1456 audit_log_format(ab, "pid=%d" 1272 audit_log_format(ab, "pid=%d", context->capset.pid);
1457 audit_log_cap(ab, "cap_pi", & 1273 audit_log_cap(ab, "cap_pi", &context->capset.cap.inheritable);
1458 audit_log_cap(ab, "cap_pp", & 1274 audit_log_cap(ab, "cap_pp", &context->capset.cap.permitted);
1459 audit_log_cap(ab, "cap_pe", & 1275 audit_log_cap(ab, "cap_pe", &context->capset.cap.effective);
1460 audit_log_cap(ab, "cap_pa", & 1276 audit_log_cap(ab, "cap_pa", &context->capset.cap.ambient);
1461 break; 1277 break;
1462 case AUDIT_MMAP: 1278 case AUDIT_MMAP:
1463 audit_log_format(ab, "fd=%d f 1279 audit_log_format(ab, "fd=%d flags=0x%x", context->mmap.fd,
1464 context->mma 1280 context->mmap.flags);
1465 break; 1281 break;
1466 case AUDIT_OPENAT2: <<
1467 audit_log_format(ab, "oflag=0 <<
1468 context->ope <<
1469 context->ope <<
1470 context->ope <<
1471 break; <<
1472 case AUDIT_EXECVE: 1282 case AUDIT_EXECVE:
1473 audit_log_execve_info(context 1283 audit_log_execve_info(context, &ab);
1474 break; 1284 break;
1475 case AUDIT_KERN_MODULE: 1285 case AUDIT_KERN_MODULE:
1476 audit_log_format(ab, "name=") 1286 audit_log_format(ab, "name=");
1477 if (context->module.name) { 1287 if (context->module.name) {
1478 audit_log_untrustedst 1288 audit_log_untrustedstring(ab, context->module.name);
1479 } else 1289 } else
1480 audit_log_format(ab, 1290 audit_log_format(ab, "(null)");
1481 1291
1482 break; 1292 break;
1483 case AUDIT_TIME_ADJNTPVAL: <<
1484 case AUDIT_TIME_INJOFFSET: <<
1485 /* this call deviates from th <<
1486 audit_log_time(context, &ab); <<
1487 break; <<
1488 } 1293 }
1489 audit_log_end(ab); 1294 audit_log_end(ab);
1490 } 1295 }
1491 1296
1492 static inline int audit_proctitle_rtrim(char 1297 static inline int audit_proctitle_rtrim(char *proctitle, int len)
1493 { 1298 {
1494 char *end = proctitle + len - 1; 1299 char *end = proctitle + len - 1;
1495 <<
1496 while (end > proctitle && !isprint(*e 1300 while (end > proctitle && !isprint(*end))
1497 end--; 1301 end--;
1498 1302
1499 /* catch the case where proctitle is 1303 /* catch the case where proctitle is only 1 non-print character */
1500 len = end - proctitle + 1; 1304 len = end - proctitle + 1;
1501 len -= isprint(proctitle[len-1]) == 0 1305 len -= isprint(proctitle[len-1]) == 0;
1502 return len; 1306 return len;
1503 } 1307 }
1504 1308
1505 /* 1309 /*
1506 * audit_log_name - produce AUDIT_PATH record 1310 * audit_log_name - produce AUDIT_PATH record from struct audit_names
1507 * @context: audit_context for the task 1311 * @context: audit_context for the task
1508 * @n: audit_names structure with reportable 1312 * @n: audit_names structure with reportable details
1509 * @path: optional path to report instead of 1313 * @path: optional path to report instead of audit_names->name
1510 * @record_num: record number to report when 1314 * @record_num: record number to report when handling a list of names
1511 * @call_panic: optional pointer to int that 1315 * @call_panic: optional pointer to int that will be updated if secid fails
1512 */ 1316 */
1513 static void audit_log_name(struct audit_conte 1317 static void audit_log_name(struct audit_context *context, struct audit_names *n,
1514 const struct path *path, 1318 const struct path *path, int record_num, int *call_panic)
1515 { 1319 {
1516 struct audit_buffer *ab; 1320 struct audit_buffer *ab;
1517 1321
1518 ab = audit_log_start(context, GFP_KER 1322 ab = audit_log_start(context, GFP_KERNEL, AUDIT_PATH);
1519 if (!ab) 1323 if (!ab)
1520 return; 1324 return;
1521 1325
1522 audit_log_format(ab, "item=%d", recor 1326 audit_log_format(ab, "item=%d", record_num);
1523 1327
1524 if (path) 1328 if (path)
1525 audit_log_d_path(ab, " name=" 1329 audit_log_d_path(ab, " name=", path);
1526 else if (n->name) { 1330 else if (n->name) {
1527 switch (n->name_len) { 1331 switch (n->name_len) {
1528 case AUDIT_NAME_FULL: 1332 case AUDIT_NAME_FULL:
1529 /* log the full path 1333 /* log the full path */
1530 audit_log_format(ab, 1334 audit_log_format(ab, " name=");
1531 audit_log_untrustedst 1335 audit_log_untrustedstring(ab, n->name->name);
1532 break; 1336 break;
1533 case 0: 1337 case 0:
1534 /* name was specified 1338 /* name was specified as a relative path and the
1535 * directory componen 1339 * directory component is the cwd
1536 */ 1340 */
1537 if (context->pwd.dent !! 1341 audit_log_d_path(ab, " name=", &context->pwd);
1538 audit_log_d_p <<
1539 else <<
1540 audit_log_for <<
1541 break; 1342 break;
1542 default: 1343 default:
1543 /* log the name's dir 1344 /* log the name's directory component */
1544 audit_log_format(ab, 1345 audit_log_format(ab, " name=");
1545 audit_log_n_untrusted 1346 audit_log_n_untrustedstring(ab, n->name->name,
1546 1347 n->name_len);
1547 } 1348 }
1548 } else 1349 } else
1549 audit_log_format(ab, " name=( 1350 audit_log_format(ab, " name=(null)");
1550 1351
1551 if (n->ino != AUDIT_INO_UNSET) 1352 if (n->ino != AUDIT_INO_UNSET)
1552 audit_log_format(ab, " inode= 1353 audit_log_format(ab, " inode=%lu dev=%02x:%02x mode=%#ho ouid=%u ogid=%u rdev=%02x:%02x",
1553 n->ino, 1354 n->ino,
1554 MAJOR(n->dev 1355 MAJOR(n->dev),
1555 MINOR(n->dev 1356 MINOR(n->dev),
1556 n->mode, 1357 n->mode,
1557 from_kuid(&i 1358 from_kuid(&init_user_ns, n->uid),
1558 from_kgid(&i 1359 from_kgid(&init_user_ns, n->gid),
1559 MAJOR(n->rde 1360 MAJOR(n->rdev),
1560 MINOR(n->rde 1361 MINOR(n->rdev));
1561 if (n->osid != 0) { 1362 if (n->osid != 0) {
1562 char *ctx = NULL; 1363 char *ctx = NULL;
1563 u32 len; 1364 u32 len;
1564 1365
1565 if (security_secid_to_secctx( 1366 if (security_secid_to_secctx(
1566 n->osid, &ctx, &len)) 1367 n->osid, &ctx, &len)) {
1567 audit_log_format(ab, 1368 audit_log_format(ab, " osid=%u", n->osid);
1568 if (call_panic) 1369 if (call_panic)
1569 *call_panic = 1370 *call_panic = 2;
1570 } else { 1371 } else {
1571 audit_log_format(ab, 1372 audit_log_format(ab, " obj=%s", ctx);
1572 security_release_secc 1373 security_release_secctx(ctx, len);
1573 } 1374 }
1574 } 1375 }
1575 1376
1576 /* log the audit_names record type */ 1377 /* log the audit_names record type */
1577 switch (n->type) { 1378 switch (n->type) {
1578 case AUDIT_TYPE_NORMAL: 1379 case AUDIT_TYPE_NORMAL:
1579 audit_log_format(ab, " namety 1380 audit_log_format(ab, " nametype=NORMAL");
1580 break; 1381 break;
1581 case AUDIT_TYPE_PARENT: 1382 case AUDIT_TYPE_PARENT:
1582 audit_log_format(ab, " namety 1383 audit_log_format(ab, " nametype=PARENT");
1583 break; 1384 break;
1584 case AUDIT_TYPE_CHILD_DELETE: 1385 case AUDIT_TYPE_CHILD_DELETE:
1585 audit_log_format(ab, " namety 1386 audit_log_format(ab, " nametype=DELETE");
1586 break; 1387 break;
1587 case AUDIT_TYPE_CHILD_CREATE: 1388 case AUDIT_TYPE_CHILD_CREATE:
1588 audit_log_format(ab, " namety 1389 audit_log_format(ab, " nametype=CREATE");
1589 break; 1390 break;
1590 default: 1391 default:
1591 audit_log_format(ab, " namety 1392 audit_log_format(ab, " nametype=UNKNOWN");
1592 break; 1393 break;
1593 } 1394 }
1594 1395
1595 audit_log_fcaps(ab, n); 1396 audit_log_fcaps(ab, n);
1596 audit_log_end(ab); 1397 audit_log_end(ab);
1597 } 1398 }
1598 1399
1599 static void audit_log_proctitle(void) 1400 static void audit_log_proctitle(void)
1600 { 1401 {
1601 int res; 1402 int res;
1602 char *buf; 1403 char *buf;
1603 char *msg = "(null)"; 1404 char *msg = "(null)";
1604 int len = strlen(msg); 1405 int len = strlen(msg);
1605 struct audit_context *context = audit 1406 struct audit_context *context = audit_context();
1606 struct audit_buffer *ab; 1407 struct audit_buffer *ab;
1607 1408
>> 1409 if (!context || context->dummy)
>> 1410 return;
>> 1411
1608 ab = audit_log_start(context, GFP_KER 1412 ab = audit_log_start(context, GFP_KERNEL, AUDIT_PROCTITLE);
1609 if (!ab) 1413 if (!ab)
1610 return; /* audit_panic or bei 1414 return; /* audit_panic or being filtered */
1611 1415
1612 audit_log_format(ab, "proctitle="); 1416 audit_log_format(ab, "proctitle=");
1613 1417
1614 /* Not cached */ 1418 /* Not cached */
1615 if (!context->proctitle.value) { 1419 if (!context->proctitle.value) {
1616 buf = kmalloc(MAX_PROCTITLE_A 1420 buf = kmalloc(MAX_PROCTITLE_AUDIT_LEN, GFP_KERNEL);
1617 if (!buf) 1421 if (!buf)
1618 goto out; 1422 goto out;
1619 /* Historically called this f 1423 /* Historically called this from procfs naming */
1620 res = get_cmdline(current, bu 1424 res = get_cmdline(current, buf, MAX_PROCTITLE_AUDIT_LEN);
1621 if (res == 0) { 1425 if (res == 0) {
1622 kfree(buf); 1426 kfree(buf);
1623 goto out; 1427 goto out;
1624 } 1428 }
1625 res = audit_proctitle_rtrim(b 1429 res = audit_proctitle_rtrim(buf, res);
1626 if (res == 0) { 1430 if (res == 0) {
1627 kfree(buf); 1431 kfree(buf);
1628 goto out; 1432 goto out;
1629 } 1433 }
1630 context->proctitle.value = bu 1434 context->proctitle.value = buf;
1631 context->proctitle.len = res; 1435 context->proctitle.len = res;
1632 } 1436 }
1633 msg = context->proctitle.value; 1437 msg = context->proctitle.value;
1634 len = context->proctitle.len; 1438 len = context->proctitle.len;
1635 out: 1439 out:
1636 audit_log_n_untrustedstring(ab, msg, 1440 audit_log_n_untrustedstring(ab, msg, len);
1637 audit_log_end(ab); 1441 audit_log_end(ab);
1638 } 1442 }
1639 1443
1640 /** <<
1641 * audit_log_uring - generate a AUDIT_URINGOP <<
1642 * @ctx: the audit context <<
1643 */ <<
1644 static void audit_log_uring(struct audit_cont <<
1645 { <<
1646 struct audit_buffer *ab; <<
1647 const struct cred *cred; <<
1648 <<
1649 ab = audit_log_start(ctx, GFP_ATOMIC, <<
1650 if (!ab) <<
1651 return; <<
1652 cred = current_cred(); <<
1653 audit_log_format(ab, "uring_op=%d", c <<
1654 if (ctx->return_valid != AUDITSC_INVA <<
1655 audit_log_format(ab, " succes <<
1656 (ctx->return <<
1657 "yes" : "no <<
1658 ctx->return_ <<
1659 audit_log_format(ab, <<
1660 " items=%d" <<
1661 " ppid=%d pid=%d uid <<
1662 " fsuid=%u egid=%u s <<
1663 ctx->name_count, <<
1664 task_ppid_nr(current <<
1665 from_kuid(&init_user <<
1666 from_kgid(&init_user <<
1667 from_kuid(&init_user <<
1668 from_kuid(&init_user <<
1669 from_kuid(&init_user <<
1670 from_kgid(&init_user <<
1671 from_kgid(&init_user <<
1672 from_kgid(&init_user <<
1673 audit_log_task_context(ab); <<
1674 audit_log_key(ab, ctx->filterkey); <<
1675 audit_log_end(ab); <<
1676 } <<
1677 <<
1678 static void audit_log_exit(void) 1444 static void audit_log_exit(void)
1679 { 1445 {
1680 int i, call_panic = 0; 1446 int i, call_panic = 0;
1681 struct audit_context *context = audit 1447 struct audit_context *context = audit_context();
1682 struct audit_buffer *ab; 1448 struct audit_buffer *ab;
1683 struct audit_aux_data *aux; 1449 struct audit_aux_data *aux;
1684 struct audit_names *n; 1450 struct audit_names *n;
1685 1451
1686 context->personality = current->perso 1452 context->personality = current->personality;
1687 1453
1688 switch (context->context) { !! 1454 ab = audit_log_start(context, GFP_KERNEL, AUDIT_SYSCALL);
1689 case AUDIT_CTX_SYSCALL: !! 1455 if (!ab)
1690 ab = audit_log_start(context, !! 1456 return; /* audit_panic has been called */
1691 if (!ab) !! 1457 audit_log_format(ab, "arch=%x syscall=%d",
1692 return; !! 1458 context->arch, context->major);
1693 audit_log_format(ab, "arch=%x !! 1459 if (context->personality != PER_LINUX)
1694 context->arc !! 1460 audit_log_format(ab, " per=%lx", context->personality);
1695 if (context->personality != P !! 1461 if (context->return_valid)
1696 audit_log_format(ab, !! 1462 audit_log_format(ab, " success=%s exit=%ld",
1697 if (context->return_valid != !! 1463 (context->return_valid==AUDITSC_SUCCESS)?"yes":"no",
1698 audit_log_format(ab, !! 1464 context->return_code);
1699 (con !! 1465
1700 "ye !! 1466 audit_log_format(ab,
1701 cont !! 1467 " a0=%lx a1=%lx a2=%lx a3=%lx items=%d",
1702 audit_log_format(ab, !! 1468 context->argv[0],
1703 " a0=%lx a1= !! 1469 context->argv[1],
1704 context->arg !! 1470 context->argv[2],
1705 context->arg !! 1471 context->argv[3],
1706 context->arg !! 1472 context->name_count);
1707 context->arg !! 1473
1708 context->nam !! 1474 audit_log_task_info(ab);
1709 audit_log_task_info(ab); !! 1475 audit_log_key(ab, context->filterkey);
1710 audit_log_key(ab, context->fi !! 1476 audit_log_end(ab);
1711 audit_log_end(ab); <<
1712 break; <<
1713 case AUDIT_CTX_URING: <<
1714 audit_log_uring(context); <<
1715 break; <<
1716 default: <<
1717 BUG(); <<
1718 break; <<
1719 } <<
1720 1477
1721 for (aux = context->aux; aux; aux = a 1478 for (aux = context->aux; aux; aux = aux->next) {
1722 1479
1723 ab = audit_log_start(context, 1480 ab = audit_log_start(context, GFP_KERNEL, aux->type);
1724 if (!ab) 1481 if (!ab)
1725 continue; /* audit_pa 1482 continue; /* audit_panic has been called */
1726 1483
1727 switch (aux->type) { 1484 switch (aux->type) {
1728 1485
1729 case AUDIT_BPRM_FCAPS: { 1486 case AUDIT_BPRM_FCAPS: {
1730 struct audit_aux_data 1487 struct audit_aux_data_bprm_fcaps *axs = (void *)aux;
1731 <<
1732 audit_log_format(ab, 1488 audit_log_format(ab, "fver=%x", axs->fcap_ver);
1733 audit_log_cap(ab, "fp 1489 audit_log_cap(ab, "fp", &axs->fcap.permitted);
1734 audit_log_cap(ab, "fi 1490 audit_log_cap(ab, "fi", &axs->fcap.inheritable);
1735 audit_log_format(ab, 1491 audit_log_format(ab, " fe=%d", axs->fcap.fE);
1736 audit_log_cap(ab, "ol 1492 audit_log_cap(ab, "old_pp", &axs->old_pcap.permitted);
1737 audit_log_cap(ab, "ol 1493 audit_log_cap(ab, "old_pi", &axs->old_pcap.inheritable);
1738 audit_log_cap(ab, "ol 1494 audit_log_cap(ab, "old_pe", &axs->old_pcap.effective);
1739 audit_log_cap(ab, "ol 1495 audit_log_cap(ab, "old_pa", &axs->old_pcap.ambient);
1740 audit_log_cap(ab, "pp 1496 audit_log_cap(ab, "pp", &axs->new_pcap.permitted);
1741 audit_log_cap(ab, "pi 1497 audit_log_cap(ab, "pi", &axs->new_pcap.inheritable);
1742 audit_log_cap(ab, "pe 1498 audit_log_cap(ab, "pe", &axs->new_pcap.effective);
1743 audit_log_cap(ab, "pa 1499 audit_log_cap(ab, "pa", &axs->new_pcap.ambient);
1744 audit_log_format(ab, 1500 audit_log_format(ab, " frootid=%d",
1745 from 1501 from_kuid(&init_user_ns,
1746 1502 axs->fcap.rootid));
1747 break; } 1503 break; }
1748 1504
1749 } 1505 }
1750 audit_log_end(ab); 1506 audit_log_end(ab);
1751 } 1507 }
1752 1508
1753 if (context->type) 1509 if (context->type)
1754 show_special(context, &call_p 1510 show_special(context, &call_panic);
1755 1511
1756 if (context->fds[0] >= 0) { 1512 if (context->fds[0] >= 0) {
1757 ab = audit_log_start(context, 1513 ab = audit_log_start(context, GFP_KERNEL, AUDIT_FD_PAIR);
1758 if (ab) { 1514 if (ab) {
1759 audit_log_format(ab, 1515 audit_log_format(ab, "fd0=%d fd1=%d",
1760 conte 1516 context->fds[0], context->fds[1]);
1761 audit_log_end(ab); 1517 audit_log_end(ab);
1762 } 1518 }
1763 } 1519 }
1764 1520
1765 if (context->sockaddr_len) { 1521 if (context->sockaddr_len) {
1766 ab = audit_log_start(context, 1522 ab = audit_log_start(context, GFP_KERNEL, AUDIT_SOCKADDR);
1767 if (ab) { 1523 if (ab) {
1768 audit_log_format(ab, 1524 audit_log_format(ab, "saddr=");
1769 audit_log_n_hex(ab, ( 1525 audit_log_n_hex(ab, (void *)context->sockaddr,
1770 conte 1526 context->sockaddr_len);
1771 audit_log_end(ab); 1527 audit_log_end(ab);
1772 } 1528 }
1773 } 1529 }
1774 1530
1775 for (aux = context->aux_pids; aux; au 1531 for (aux = context->aux_pids; aux; aux = aux->next) {
1776 struct audit_aux_data_pids *a 1532 struct audit_aux_data_pids *axs = (void *)aux;
1777 1533
1778 for (i = 0; i < axs->pid_coun 1534 for (i = 0; i < axs->pid_count; i++)
1779 if (audit_log_pid_con 1535 if (audit_log_pid_context(context, axs->target_pid[i],
1780 1536 axs->target_auid[i],
1781 1537 axs->target_uid[i],
1782 1538 axs->target_sessionid[i],
1783 1539 axs->target_sid[i],
1784 1540 axs->target_comm[i]))
1785 call_panic = 1541 call_panic = 1;
1786 } 1542 }
1787 1543
1788 if (context->target_pid && 1544 if (context->target_pid &&
1789 audit_log_pid_context(context, co 1545 audit_log_pid_context(context, context->target_pid,
1790 context->ta 1546 context->target_auid, context->target_uid,
1791 context->ta 1547 context->target_sessionid,
1792 context->ta 1548 context->target_sid, context->target_comm))
1793 call_panic = 1; 1549 call_panic = 1;
1794 1550
1795 if (context->pwd.dentry && context->p 1551 if (context->pwd.dentry && context->pwd.mnt) {
1796 ab = audit_log_start(context, 1552 ab = audit_log_start(context, GFP_KERNEL, AUDIT_CWD);
1797 if (ab) { 1553 if (ab) {
1798 audit_log_d_path(ab, 1554 audit_log_d_path(ab, "cwd=", &context->pwd);
1799 audit_log_end(ab); 1555 audit_log_end(ab);
1800 } 1556 }
1801 } 1557 }
1802 1558
1803 i = 0; 1559 i = 0;
1804 list_for_each_entry(n, &context->name 1560 list_for_each_entry(n, &context->names_list, list) {
1805 if (n->hidden) 1561 if (n->hidden)
1806 continue; 1562 continue;
1807 audit_log_name(context, n, NU 1563 audit_log_name(context, n, NULL, i++, &call_panic);
1808 } 1564 }
1809 1565
1810 if (context->context == AUDIT_CTX_SYS !! 1566 audit_log_proctitle();
1811 audit_log_proctitle(); <<
1812 1567
1813 /* Send end of event record to help u 1568 /* Send end of event record to help user space know we are finished */
1814 ab = audit_log_start(context, GFP_KER 1569 ab = audit_log_start(context, GFP_KERNEL, AUDIT_EOE);
1815 if (ab) 1570 if (ab)
1816 audit_log_end(ab); 1571 audit_log_end(ab);
1817 if (call_panic) 1572 if (call_panic)
1818 audit_panic("error in audit_l !! 1573 audit_panic("error converting sid to string");
1819 } 1574 }
1820 1575
1821 /** 1576 /**
1822 * __audit_free - free a per-task audit conte 1577 * __audit_free - free a per-task audit context
1823 * @tsk: task whose audit context block to fr 1578 * @tsk: task whose audit context block to free
1824 * 1579 *
1825 * Called from copy_process, do_exit, and the !! 1580 * Called from copy_process and do_exit
1826 */ 1581 */
1827 void __audit_free(struct task_struct *tsk) 1582 void __audit_free(struct task_struct *tsk)
1828 { 1583 {
1829 struct audit_context *context = tsk-> 1584 struct audit_context *context = tsk->audit_context;
1830 1585
1831 if (!context) 1586 if (!context)
1832 return; 1587 return;
1833 1588
1834 /* this may generate CONFIG_CHANGE re <<
1835 if (!list_empty(&context->killed_tree 1589 if (!list_empty(&context->killed_trees))
1836 audit_kill_trees(context); 1590 audit_kill_trees(context);
1837 1591
1838 /* We are called either by do_exit() 1592 /* We are called either by do_exit() or the fork() error handling code;
1839 * in the former case tsk == current 1593 * in the former case tsk == current and in the latter tsk is a
1840 * random task_struct that doesn't ha !! 1594 * random task_struct that doesn't doesn't have any meaningful data we
1841 * need to log via audit_log_exit(). 1595 * need to log via audit_log_exit().
1842 */ 1596 */
1843 if (tsk == current && !context->dummy !! 1597 if (tsk == current && !context->dummy && context->in_syscall) {
1844 context->return_valid = AUDIT !! 1598 context->return_valid = 0;
1845 context->return_code = 0; 1599 context->return_code = 0;
1846 if (context->context == AUDIT !! 1600
1847 audit_filter_syscall( !! 1601 audit_filter_syscall(tsk, context,
1848 audit_filter_inodes(t !! 1602 &audit_filter_list[AUDIT_FILTER_EXIT]);
1849 if (context->current_ !! 1603 audit_filter_inodes(tsk, context);
1850 audit_log_exi !! 1604 if (context->current_state == AUDIT_RECORD_CONTEXT)
1851 } else if (context->context = !! 1605 audit_log_exit();
1852 /* TODO: verify this <<
1853 audit_filter_uring(ts <<
1854 audit_filter_inodes(t <<
1855 if (context->current_ <<
1856 audit_log_uri <<
1857 } <<
1858 } 1606 }
1859 1607
1860 audit_set_context(tsk, NULL); 1608 audit_set_context(tsk, NULL);
1861 audit_free_context(context); 1609 audit_free_context(context);
1862 } 1610 }
1863 1611
1864 /** 1612 /**
1865 * audit_return_fixup - fixup the return code <<
1866 * @ctx: the audit_context <<
1867 * @success: true/false value to indicate if <<
1868 * @code: operation return code <<
1869 * <<
1870 * We need to fixup the return code in the au <<
1871 * codes are later going to be fixed by the a <<
1872 */ <<
1873 static void audit_return_fixup(struct audit_c <<
1874 int success, l <<
1875 { <<
1876 /* <<
1877 * This is actually a test for: <<
1878 * (rc == ERESTARTSYS ) || (rc == ERE <<
1879 * (rc == ERESTARTNOHAND) || (rc == E <<
1880 * <<
1881 * but is faster than a bunch of || <<
1882 */ <<
1883 if (unlikely(code <= -ERESTARTSYS) && <<
1884 (code >= -ERESTART_RESTARTBLOCK) <<
1885 (code != -ENOIOCTLCMD)) <<
1886 ctx->return_code = -EINTR; <<
1887 else <<
1888 ctx->return_code = code; <<
1889 ctx->return_valid = (success ? AUDITS <<
1890 } <<
1891 <<
1892 /** <<
1893 * __audit_uring_entry - prepare the kernel t <<
1894 * @op: the io_uring opcode <<
1895 * <<
1896 * This is similar to audit_syscall_entry() b <<
1897 * operations. This function should only eve <<
1898 * audit_uring_entry() as we rely on the audi <<
1899 * function. <<
1900 */ <<
1901 void __audit_uring_entry(u8 op) <<
1902 { <<
1903 struct audit_context *ctx = audit_con <<
1904 <<
1905 if (ctx->state == AUDIT_STATE_DISABLE <<
1906 return; <<
1907 <<
1908 /* <<
1909 * NOTE: It's possible that we can be <<
1910 * before it returns to userspa <<
1911 * is called. In this case the <<
1912 * the io_uring details and ret <<
1913 */ <<
1914 ctx->uring_op = op; <<
1915 if (ctx->context == AUDIT_CTX_SYSCALL <<
1916 return; <<
1917 <<
1918 ctx->dummy = !audit_n_rules; <<
1919 if (!ctx->dummy && ctx->state == AUDI <<
1920 ctx->prio = 0; <<
1921 <<
1922 ctx->context = AUDIT_CTX_URING; <<
1923 ctx->current_state = ctx->state; <<
1924 ktime_get_coarse_real_ts64(&ctx->ctim <<
1925 } <<
1926 <<
1927 /** <<
1928 * __audit_uring_exit - wrap up the kernel ta <<
1929 * @success: true/false value to indicate if <<
1930 * @code: operation return code <<
1931 * <<
1932 * This is similar to audit_syscall_exit() bu <<
1933 * operations. This function should only eve <<
1934 * audit_uring_exit() as we rely on the audit <<
1935 * function. <<
1936 */ <<
1937 void __audit_uring_exit(int success, long cod <<
1938 { <<
1939 struct audit_context *ctx = audit_con <<
1940 <<
1941 if (ctx->dummy) { <<
1942 if (ctx->context != AUDIT_CTX <<
1943 return; <<
1944 goto out; <<
1945 } <<
1946 <<
1947 audit_return_fixup(ctx, success, code <<
1948 if (ctx->context == AUDIT_CTX_SYSCALL <<
1949 /* <<
1950 * NOTE: See the note in __au <<
1951 * where we may be call <<
1952 * return to userspace <<
1953 * case we simply emit <<
1954 * normal syscall exit <<
1955 * everything else. <<
1956 * It is also worth men <<
1957 * the current process <<
1958 * used during the norm <<
1959 * in mind if/when we m <<
1960 */ <<
1961 <<
1962 /* <<
1963 * We need to filter on the s <<
1964 * should emit a URINGOP reco <<
1965 * solves the problem where u <<
1966 * syscall records in the "ex <<
1967 * the behavior here. <<
1968 */ <<
1969 audit_filter_syscall(current, <<
1970 if (ctx->current_state != AUD <<
1971 audit_filter_uring(cu <<
1972 audit_filter_inodes(current, <<
1973 if (ctx->current_state != AUD <<
1974 return; <<
1975 <<
1976 audit_log_uring(ctx); <<
1977 return; <<
1978 } <<
1979 <<
1980 /* this may generate CONFIG_CHANGE re <<
1981 if (!list_empty(&ctx->killed_trees)) <<
1982 audit_kill_trees(ctx); <<
1983 <<
1984 /* run through both filters to ensure <<
1985 audit_filter_uring(current, ctx); <<
1986 audit_filter_inodes(current, ctx); <<
1987 if (ctx->current_state != AUDIT_STATE <<
1988 goto out; <<
1989 audit_log_exit(); <<
1990 <<
1991 out: <<
1992 audit_reset_context(ctx); <<
1993 } <<
1994 <<
1995 /** <<
1996 * __audit_syscall_entry - fill in an audit r 1613 * __audit_syscall_entry - fill in an audit record at syscall entry
1997 * @major: major syscall type (function) 1614 * @major: major syscall type (function)
1998 * @a1: additional syscall register 1 1615 * @a1: additional syscall register 1
1999 * @a2: additional syscall register 2 1616 * @a2: additional syscall register 2
2000 * @a3: additional syscall register 3 1617 * @a3: additional syscall register 3
2001 * @a4: additional syscall register 4 1618 * @a4: additional syscall register 4
2002 * 1619 *
2003 * Fill in audit context at syscall entry. T 1620 * Fill in audit context at syscall entry. This only happens if the
2004 * audit context was created when the task wa 1621 * audit context was created when the task was created and the state or
2005 * filters demand the audit context be built. 1622 * filters demand the audit context be built. If the state from the
2006 * per-task filter or from the per-syscall fi !! 1623 * per-task filter or from the per-syscall filter is AUDIT_RECORD_CONTEXT,
2007 * then the record will be written at syscall 1624 * then the record will be written at syscall exit time (otherwise, it
2008 * will only be written if another part of th 1625 * will only be written if another part of the kernel requests that it
2009 * be written). 1626 * be written).
2010 */ 1627 */
2011 void __audit_syscall_entry(int major, unsigne 1628 void __audit_syscall_entry(int major, unsigned long a1, unsigned long a2,
2012 unsigned long a3, 1629 unsigned long a3, unsigned long a4)
2013 { 1630 {
2014 struct audit_context *context = audit 1631 struct audit_context *context = audit_context();
2015 enum audit_state state; 1632 enum audit_state state;
2016 1633
2017 if (!audit_enabled || !context) 1634 if (!audit_enabled || !context)
2018 return; 1635 return;
2019 1636
2020 WARN_ON(context->context != AUDIT_CTX !! 1637 BUG_ON(context->in_syscall || context->name_count);
2021 WARN_ON(context->name_count); <<
2022 if (context->context != AUDIT_CTX_UNU <<
2023 audit_panic("unrecoverable er <<
2024 return; <<
2025 } <<
2026 1638
2027 state = context->state; 1639 state = context->state;
2028 if (state == AUDIT_STATE_DISABLED) !! 1640 if (state == AUDIT_DISABLED)
2029 return; 1641 return;
2030 1642
2031 context->dummy = !audit_n_rules; 1643 context->dummy = !audit_n_rules;
2032 if (!context->dummy && state == AUDIT !! 1644 if (!context->dummy && state == AUDIT_BUILD_CONTEXT) {
2033 context->prio = 0; 1645 context->prio = 0;
2034 if (auditd_test_task(current) 1646 if (auditd_test_task(current))
2035 return; 1647 return;
2036 } 1648 }
2037 1649
2038 context->arch = syscall_get_arc 1650 context->arch = syscall_get_arch(current);
2039 context->major = major; 1651 context->major = major;
2040 context->argv[0] = a1; 1652 context->argv[0] = a1;
2041 context->argv[1] = a2; 1653 context->argv[1] = a2;
2042 context->argv[2] = a3; 1654 context->argv[2] = a3;
2043 context->argv[3] = a4; 1655 context->argv[3] = a4;
2044 context->context = AUDIT_CTX_SYSCALL; !! 1656 context->serial = 0;
>> 1657 context->in_syscall = 1;
2045 context->current_state = state; 1658 context->current_state = state;
>> 1659 context->ppid = 0;
2046 ktime_get_coarse_real_ts64(&context-> 1660 ktime_get_coarse_real_ts64(&context->ctime);
2047 } 1661 }
2048 1662
2049 /** 1663 /**
2050 * __audit_syscall_exit - deallocate audit co 1664 * __audit_syscall_exit - deallocate audit context after a system call
2051 * @success: success value of the syscall 1665 * @success: success value of the syscall
2052 * @return_code: return value of the syscall 1666 * @return_code: return value of the syscall
2053 * 1667 *
2054 * Tear down after system call. If the audit 1668 * Tear down after system call. If the audit context has been marked as
2055 * auditable (either because of the AUDIT_STA !! 1669 * auditable (either because of the AUDIT_RECORD_CONTEXT state from
2056 * filtering, or because some other part of t 1670 * filtering, or because some other part of the kernel wrote an audit
2057 * message), then write out the syscall infor 1671 * message), then write out the syscall information. In call cases,
2058 * free the names stored from getname(). 1672 * free the names stored from getname().
2059 */ 1673 */
2060 void __audit_syscall_exit(int success, long r 1674 void __audit_syscall_exit(int success, long return_code)
2061 { 1675 {
2062 struct audit_context *context = audit !! 1676 struct audit_context *context;
2063 1677
2064 if (!context || context->dummy || !! 1678 context = audit_context();
2065 context->context != AUDIT_CTX_SYS !! 1679 if (!context)
2066 goto out; !! 1680 return;
2067 1681
2068 /* this may generate CONFIG_CHANGE re <<
2069 if (!list_empty(&context->killed_tree 1682 if (!list_empty(&context->killed_trees))
2070 audit_kill_trees(context); 1683 audit_kill_trees(context);
2071 1684
2072 audit_return_fixup(context, success, !! 1685 if (!context->dummy && context->in_syscall) {
2073 /* run through both filters to ensure !! 1686 if (success)
2074 audit_filter_syscall(current, context !! 1687 context->return_valid = AUDITSC_SUCCESS;
2075 audit_filter_inodes(current, context) !! 1688 else
2076 if (context->current_state != AUDIT_S !! 1689 context->return_valid = AUDITSC_FAILURE;
2077 goto out; <<
2078 1690
2079 audit_log_exit(); !! 1691 /*
2080 !! 1692 * we need to fix up the return code in the audit logs if the
2081 out: !! 1693 * actual return codes are later going to be fixed up by the
2082 audit_reset_context(context); !! 1694 * arch specific signal handlers
>> 1695 *
>> 1696 * This is actually a test for:
>> 1697 * (rc == ERESTARTSYS ) || (rc == ERESTARTNOINTR) ||
>> 1698 * (rc == ERESTARTNOHAND) || (rc == ERESTART_RESTARTBLOCK)
>> 1699 *
>> 1700 * but is faster than a bunch of ||
>> 1701 */
>> 1702 if (unlikely(return_code <= -ERESTARTSYS) &&
>> 1703 (return_code >= -ERESTART_RESTARTBLOCK) &&
>> 1704 (return_code != -ENOIOCTLCMD))
>> 1705 context->return_code = -EINTR;
>> 1706 else
>> 1707 context->return_code = return_code;
>> 1708
>> 1709 audit_filter_syscall(current, context,
>> 1710 &audit_filter_list[AUDIT_FILTER_EXIT]);
>> 1711 audit_filter_inodes(current, context);
>> 1712 if (context->current_state == AUDIT_RECORD_CONTEXT)
>> 1713 audit_log_exit();
>> 1714 }
>> 1715
>> 1716 context->in_syscall = 0;
>> 1717 context->prio = context->state == AUDIT_RECORD_CONTEXT ? ~0ULL : 0;
>> 1718
>> 1719 audit_free_module(context);
>> 1720 audit_free_names(context);
>> 1721 unroll_tree_refs(context, NULL, 0);
>> 1722 audit_free_aux(context);
>> 1723 context->aux = NULL;
>> 1724 context->aux_pids = NULL;
>> 1725 context->target_pid = 0;
>> 1726 context->target_sid = 0;
>> 1727 context->sockaddr_len = 0;
>> 1728 context->type = 0;
>> 1729 context->fds[0] = -1;
>> 1730 if (context->state != AUDIT_RECORD_CONTEXT) {
>> 1731 kfree(context->filterkey);
>> 1732 context->filterkey = NULL;
>> 1733 }
2083 } 1734 }
2084 1735
2085 static inline void handle_one(const struct in 1736 static inline void handle_one(const struct inode *inode)
2086 { 1737 {
2087 struct audit_context *context; 1738 struct audit_context *context;
2088 struct audit_tree_refs *p; 1739 struct audit_tree_refs *p;
2089 struct audit_chunk *chunk; 1740 struct audit_chunk *chunk;
2090 int count; 1741 int count;
2091 <<
2092 if (likely(!inode->i_fsnotify_marks)) 1742 if (likely(!inode->i_fsnotify_marks))
2093 return; 1743 return;
2094 context = audit_context(); 1744 context = audit_context();
2095 p = context->trees; 1745 p = context->trees;
2096 count = context->tree_count; 1746 count = context->tree_count;
2097 rcu_read_lock(); 1747 rcu_read_lock();
2098 chunk = audit_tree_lookup(inode); 1748 chunk = audit_tree_lookup(inode);
2099 rcu_read_unlock(); 1749 rcu_read_unlock();
2100 if (!chunk) 1750 if (!chunk)
2101 return; 1751 return;
2102 if (likely(put_tree_ref(context, chun 1752 if (likely(put_tree_ref(context, chunk)))
2103 return; 1753 return;
2104 if (unlikely(!grow_tree_refs(context) 1754 if (unlikely(!grow_tree_refs(context))) {
2105 pr_warn("out of memory, audit 1755 pr_warn("out of memory, audit has lost a tree reference\n");
2106 audit_set_auditable(context); 1756 audit_set_auditable(context);
2107 audit_put_chunk(chunk); 1757 audit_put_chunk(chunk);
2108 unroll_tree_refs(context, p, 1758 unroll_tree_refs(context, p, count);
2109 return; 1759 return;
2110 } 1760 }
2111 put_tree_ref(context, chunk); 1761 put_tree_ref(context, chunk);
2112 } 1762 }
2113 1763
2114 static void handle_path(const struct dentry * 1764 static void handle_path(const struct dentry *dentry)
2115 { 1765 {
2116 struct audit_context *context; 1766 struct audit_context *context;
2117 struct audit_tree_refs *p; 1767 struct audit_tree_refs *p;
2118 const struct dentry *d, *parent; 1768 const struct dentry *d, *parent;
2119 struct audit_chunk *drop; 1769 struct audit_chunk *drop;
2120 unsigned long seq; 1770 unsigned long seq;
2121 int count; 1771 int count;
2122 1772
2123 context = audit_context(); 1773 context = audit_context();
2124 p = context->trees; 1774 p = context->trees;
2125 count = context->tree_count; 1775 count = context->tree_count;
2126 retry: 1776 retry:
2127 drop = NULL; 1777 drop = NULL;
2128 d = dentry; 1778 d = dentry;
2129 rcu_read_lock(); 1779 rcu_read_lock();
2130 seq = read_seqbegin(&rename_lock); 1780 seq = read_seqbegin(&rename_lock);
2131 for (;;) { !! 1781 for(;;) {
2132 struct inode *inode = d_backi 1782 struct inode *inode = d_backing_inode(d);
2133 <<
2134 if (inode && unlikely(inode-> 1783 if (inode && unlikely(inode->i_fsnotify_marks)) {
2135 struct audit_chunk *c 1784 struct audit_chunk *chunk;
2136 <<
2137 chunk = audit_tree_lo 1785 chunk = audit_tree_lookup(inode);
2138 if (chunk) { 1786 if (chunk) {
2139 if (unlikely( 1787 if (unlikely(!put_tree_ref(context, chunk))) {
2140 drop 1788 drop = chunk;
2141 break 1789 break;
2142 } 1790 }
2143 } 1791 }
2144 } 1792 }
2145 parent = d->d_parent; 1793 parent = d->d_parent;
2146 if (parent == d) 1794 if (parent == d)
2147 break; 1795 break;
2148 d = parent; 1796 d = parent;
2149 } 1797 }
2150 if (unlikely(read_seqretry(&rename_lo 1798 if (unlikely(read_seqretry(&rename_lock, seq) || drop)) { /* in this order */
2151 rcu_read_unlock(); 1799 rcu_read_unlock();
2152 if (!drop) { 1800 if (!drop) {
2153 /* just a race with r 1801 /* just a race with rename */
2154 unroll_tree_refs(cont 1802 unroll_tree_refs(context, p, count);
2155 goto retry; 1803 goto retry;
2156 } 1804 }
2157 audit_put_chunk(drop); 1805 audit_put_chunk(drop);
2158 if (grow_tree_refs(context)) 1806 if (grow_tree_refs(context)) {
2159 /* OK, got more space 1807 /* OK, got more space */
2160 unroll_tree_refs(cont 1808 unroll_tree_refs(context, p, count);
2161 goto retry; 1809 goto retry;
2162 } 1810 }
2163 /* too bad */ 1811 /* too bad */
2164 pr_warn("out of memory, audit 1812 pr_warn("out of memory, audit has lost a tree reference\n");
2165 unroll_tree_refs(context, p, 1813 unroll_tree_refs(context, p, count);
2166 audit_set_auditable(context); 1814 audit_set_auditable(context);
2167 return; 1815 return;
2168 } 1816 }
2169 rcu_read_unlock(); 1817 rcu_read_unlock();
2170 } 1818 }
2171 1819
2172 static struct audit_names *audit_alloc_name(s 1820 static struct audit_names *audit_alloc_name(struct audit_context *context,
2173 1821 unsigned char type)
2174 { 1822 {
2175 struct audit_names *aname; 1823 struct audit_names *aname;
2176 1824
2177 if (context->name_count < AUDIT_NAMES 1825 if (context->name_count < AUDIT_NAMES) {
2178 aname = &context->preallocate 1826 aname = &context->preallocated_names[context->name_count];
2179 memset(aname, 0, sizeof(*anam 1827 memset(aname, 0, sizeof(*aname));
2180 } else { 1828 } else {
2181 aname = kzalloc(sizeof(*aname 1829 aname = kzalloc(sizeof(*aname), GFP_NOFS);
2182 if (!aname) 1830 if (!aname)
2183 return NULL; 1831 return NULL;
2184 aname->should_free = true; 1832 aname->should_free = true;
2185 } 1833 }
2186 1834
2187 aname->ino = AUDIT_INO_UNSET; 1835 aname->ino = AUDIT_INO_UNSET;
2188 aname->type = type; 1836 aname->type = type;
2189 list_add_tail(&aname->list, &context- 1837 list_add_tail(&aname->list, &context->names_list);
2190 1838
2191 context->name_count++; 1839 context->name_count++;
2192 if (!context->pwd.dentry) <<
2193 get_fs_pwd(current->fs, &cont <<
2194 return aname; 1840 return aname;
2195 } 1841 }
2196 1842
2197 /** 1843 /**
2198 * __audit_reusename - fill out filename with 1844 * __audit_reusename - fill out filename with info from existing entry
2199 * @uptr: userland ptr to pathname 1845 * @uptr: userland ptr to pathname
2200 * 1846 *
2201 * Search the audit_names list for the curren 1847 * Search the audit_names list for the current audit context. If there is an
2202 * existing entry with a matching "uptr" then 1848 * existing entry with a matching "uptr" then return the filename
2203 * associated with that audit_name. If not, r 1849 * associated with that audit_name. If not, return NULL.
2204 */ 1850 */
2205 struct filename * 1851 struct filename *
2206 __audit_reusename(const __user char *uptr) 1852 __audit_reusename(const __user char *uptr)
2207 { 1853 {
2208 struct audit_context *context = audit 1854 struct audit_context *context = audit_context();
2209 struct audit_names *n; 1855 struct audit_names *n;
2210 1856
2211 list_for_each_entry(n, &context->name 1857 list_for_each_entry(n, &context->names_list, list) {
2212 if (!n->name) 1858 if (!n->name)
2213 continue; 1859 continue;
2214 if (n->name->uptr == uptr) { 1860 if (n->name->uptr == uptr) {
2215 atomic_inc(&n->name-> !! 1861 n->name->refcnt++;
2216 return n->name; 1862 return n->name;
2217 } 1863 }
2218 } 1864 }
2219 return NULL; 1865 return NULL;
2220 } 1866 }
2221 1867
2222 /** 1868 /**
2223 * __audit_getname - add a name to the list 1869 * __audit_getname - add a name to the list
2224 * @name: name to add 1870 * @name: name to add
2225 * 1871 *
2226 * Add a name to the list of audit names for 1872 * Add a name to the list of audit names for this context.
2227 * Called from fs/namei.c:getname(). 1873 * Called from fs/namei.c:getname().
2228 */ 1874 */
2229 void __audit_getname(struct filename *name) 1875 void __audit_getname(struct filename *name)
2230 { 1876 {
2231 struct audit_context *context = audit 1877 struct audit_context *context = audit_context();
2232 struct audit_names *n; 1878 struct audit_names *n;
2233 1879
2234 if (context->context == AUDIT_CTX_UNU !! 1880 if (!context->in_syscall)
2235 return; 1881 return;
2236 1882
2237 n = audit_alloc_name(context, AUDIT_T 1883 n = audit_alloc_name(context, AUDIT_TYPE_UNKNOWN);
2238 if (!n) 1884 if (!n)
2239 return; 1885 return;
2240 1886
2241 n->name = name; 1887 n->name = name;
2242 n->name_len = AUDIT_NAME_FULL; 1888 n->name_len = AUDIT_NAME_FULL;
2243 name->aname = n; 1889 name->aname = n;
2244 atomic_inc(&name->refcnt); !! 1890 name->refcnt++;
>> 1891
>> 1892 if (!context->pwd.dentry)
>> 1893 get_fs_pwd(current->fs, &context->pwd);
2245 } 1894 }
2246 1895
2247 static inline int audit_copy_fcaps(struct aud 1896 static inline int audit_copy_fcaps(struct audit_names *name,
2248 const stru 1897 const struct dentry *dentry)
2249 { 1898 {
2250 struct cpu_vfs_cap_data caps; 1899 struct cpu_vfs_cap_data caps;
2251 int rc; 1900 int rc;
2252 1901
2253 if (!dentry) 1902 if (!dentry)
2254 return 0; 1903 return 0;
2255 1904
2256 rc = get_vfs_caps_from_disk(&nop_mnt_ !! 1905 rc = get_vfs_caps_from_disk(dentry, &caps);
2257 if (rc) 1906 if (rc)
2258 return rc; 1907 return rc;
2259 1908
2260 name->fcap.permitted = caps.permitted 1909 name->fcap.permitted = caps.permitted;
2261 name->fcap.inheritable = caps.inherit 1910 name->fcap.inheritable = caps.inheritable;
2262 name->fcap.fE = !!(caps.magic_etc & V 1911 name->fcap.fE = !!(caps.magic_etc & VFS_CAP_FLAGS_EFFECTIVE);
2263 name->fcap.rootid = caps.rootid; 1912 name->fcap.rootid = caps.rootid;
2264 name->fcap_ver = (caps.magic_etc & VF 1913 name->fcap_ver = (caps.magic_etc & VFS_CAP_REVISION_MASK) >>
2265 VFS_CAP_REVIS 1914 VFS_CAP_REVISION_SHIFT;
2266 1915
2267 return 0; 1916 return 0;
2268 } 1917 }
2269 1918
2270 /* Copy inode data into an audit_names. */ 1919 /* Copy inode data into an audit_names. */
2271 static void audit_copy_inode(struct audit_nam 1920 static void audit_copy_inode(struct audit_names *name,
2272 const struct den 1921 const struct dentry *dentry,
2273 struct inode *in 1922 struct inode *inode, unsigned int flags)
2274 { 1923 {
2275 name->ino = inode->i_ino; 1924 name->ino = inode->i_ino;
2276 name->dev = inode->i_sb->s_dev; 1925 name->dev = inode->i_sb->s_dev;
2277 name->mode = inode->i_mode; 1926 name->mode = inode->i_mode;
2278 name->uid = inode->i_uid; 1927 name->uid = inode->i_uid;
2279 name->gid = inode->i_gid; 1928 name->gid = inode->i_gid;
2280 name->rdev = inode->i_rdev; 1929 name->rdev = inode->i_rdev;
2281 security_inode_getsecid(inode, &name- 1930 security_inode_getsecid(inode, &name->osid);
2282 if (flags & AUDIT_INODE_NOEVAL) { 1931 if (flags & AUDIT_INODE_NOEVAL) {
2283 name->fcap_ver = -1; 1932 name->fcap_ver = -1;
2284 return; 1933 return;
2285 } 1934 }
2286 audit_copy_fcaps(name, dentry); 1935 audit_copy_fcaps(name, dentry);
2287 } 1936 }
2288 1937
2289 /** 1938 /**
2290 * __audit_inode - store the inode and device 1939 * __audit_inode - store the inode and device from a lookup
2291 * @name: name being audited 1940 * @name: name being audited
2292 * @dentry: dentry being audited 1941 * @dentry: dentry being audited
2293 * @flags: attributes for this particular ent 1942 * @flags: attributes for this particular entry
2294 */ 1943 */
2295 void __audit_inode(struct filename *name, con 1944 void __audit_inode(struct filename *name, const struct dentry *dentry,
2296 unsigned int flags) 1945 unsigned int flags)
2297 { 1946 {
2298 struct audit_context *context = audit 1947 struct audit_context *context = audit_context();
2299 struct inode *inode = d_backing_inode 1948 struct inode *inode = d_backing_inode(dentry);
2300 struct audit_names *n; 1949 struct audit_names *n;
2301 bool parent = flags & AUDIT_INODE_PAR 1950 bool parent = flags & AUDIT_INODE_PARENT;
2302 struct audit_entry *e; 1951 struct audit_entry *e;
2303 struct list_head *list = &audit_filte 1952 struct list_head *list = &audit_filter_list[AUDIT_FILTER_FS];
2304 int i; 1953 int i;
2305 1954
2306 if (context->context == AUDIT_CTX_UNU !! 1955 if (!context->in_syscall)
2307 return; 1956 return;
2308 1957
2309 rcu_read_lock(); 1958 rcu_read_lock();
2310 list_for_each_entry_rcu(e, list, list 1959 list_for_each_entry_rcu(e, list, list) {
2311 for (i = 0; i < e->rule.field 1960 for (i = 0; i < e->rule.field_count; i++) {
2312 struct audit_field *f 1961 struct audit_field *f = &e->rule.fields[i];
2313 1962
2314 if (f->type == AUDIT_ 1963 if (f->type == AUDIT_FSTYPE
2315 && audit_comparat 1964 && audit_comparator(inode->i_sb->s_magic,
2316 1965 f->op, f->val)
2317 && e->rule.action 1966 && e->rule.action == AUDIT_NEVER) {
2318 rcu_read_unlo 1967 rcu_read_unlock();
2319 return; 1968 return;
2320 } 1969 }
2321 } 1970 }
2322 } 1971 }
2323 rcu_read_unlock(); 1972 rcu_read_unlock();
2324 1973
2325 if (!name) 1974 if (!name)
2326 goto out_alloc; 1975 goto out_alloc;
2327 1976
2328 /* 1977 /*
2329 * If we have a pointer to an audit_n 1978 * If we have a pointer to an audit_names entry already, then we can
2330 * just use it directly if the type i 1979 * just use it directly if the type is correct.
2331 */ 1980 */
2332 n = name->aname; 1981 n = name->aname;
2333 if (n) { 1982 if (n) {
2334 if (parent) { 1983 if (parent) {
2335 if (n->type == AUDIT_ 1984 if (n->type == AUDIT_TYPE_PARENT ||
2336 n->type == AUDIT_ 1985 n->type == AUDIT_TYPE_UNKNOWN)
2337 goto out; 1986 goto out;
2338 } else { 1987 } else {
2339 if (n->type != AUDIT_ 1988 if (n->type != AUDIT_TYPE_PARENT)
2340 goto out; 1989 goto out;
2341 } 1990 }
2342 } 1991 }
2343 1992
2344 list_for_each_entry_reverse(n, &conte 1993 list_for_each_entry_reverse(n, &context->names_list, list) {
2345 if (n->ino) { 1994 if (n->ino) {
2346 /* valid inode number 1995 /* valid inode number, use that for the comparison */
2347 if (n->ino != inode-> 1996 if (n->ino != inode->i_ino ||
2348 n->dev != inode-> 1997 n->dev != inode->i_sb->s_dev)
2349 continue; 1998 continue;
2350 } else if (n->name) { 1999 } else if (n->name) {
2351 /* inode number has n 2000 /* inode number has not been set, check the name */
2352 if (strcmp(n->name->n 2001 if (strcmp(n->name->name, name->name))
2353 continue; 2002 continue;
2354 } else 2003 } else
2355 /* no inode and no na 2004 /* no inode and no name (?!) ... this is odd ... */
2356 continue; 2005 continue;
2357 2006
2358 /* match the correct record t 2007 /* match the correct record type */
2359 if (parent) { 2008 if (parent) {
2360 if (n->type == AUDIT_ 2009 if (n->type == AUDIT_TYPE_PARENT ||
2361 n->type == AUDIT_ 2010 n->type == AUDIT_TYPE_UNKNOWN)
2362 goto out; 2011 goto out;
2363 } else { 2012 } else {
2364 if (n->type != AUDIT_ 2013 if (n->type != AUDIT_TYPE_PARENT)
2365 goto out; 2014 goto out;
2366 } 2015 }
2367 } 2016 }
2368 2017
2369 out_alloc: 2018 out_alloc:
2370 /* unable to find an entry with both 2019 /* unable to find an entry with both a matching name and type */
2371 n = audit_alloc_name(context, AUDIT_T 2020 n = audit_alloc_name(context, AUDIT_TYPE_UNKNOWN);
2372 if (!n) 2021 if (!n)
2373 return; 2022 return;
2374 if (name) { 2023 if (name) {
2375 n->name = name; 2024 n->name = name;
2376 atomic_inc(&name->refcnt); !! 2025 name->refcnt++;
2377 } 2026 }
2378 2027
2379 out: 2028 out:
2380 if (parent) { 2029 if (parent) {
2381 n->name_len = n->name ? paren 2030 n->name_len = n->name ? parent_len(n->name->name) : AUDIT_NAME_FULL;
2382 n->type = AUDIT_TYPE_PARENT; 2031 n->type = AUDIT_TYPE_PARENT;
2383 if (flags & AUDIT_INODE_HIDDE 2032 if (flags & AUDIT_INODE_HIDDEN)
2384 n->hidden = true; 2033 n->hidden = true;
2385 } else { 2034 } else {
2386 n->name_len = AUDIT_NAME_FULL 2035 n->name_len = AUDIT_NAME_FULL;
2387 n->type = AUDIT_TYPE_NORMAL; 2036 n->type = AUDIT_TYPE_NORMAL;
2388 } 2037 }
2389 handle_path(dentry); 2038 handle_path(dentry);
2390 audit_copy_inode(n, dentry, inode, fl 2039 audit_copy_inode(n, dentry, inode, flags & AUDIT_INODE_NOEVAL);
2391 } 2040 }
2392 2041
2393 void __audit_file(const struct file *file) 2042 void __audit_file(const struct file *file)
2394 { 2043 {
2395 __audit_inode(NULL, file->f_path.dent 2044 __audit_inode(NULL, file->f_path.dentry, 0);
2396 } 2045 }
2397 2046
2398 /** 2047 /**
2399 * __audit_inode_child - collect inode info f 2048 * __audit_inode_child - collect inode info for created/removed objects
2400 * @parent: inode of dentry parent 2049 * @parent: inode of dentry parent
2401 * @dentry: dentry being audited 2050 * @dentry: dentry being audited
2402 * @type: AUDIT_TYPE_* value that we're loo 2051 * @type: AUDIT_TYPE_* value that we're looking for
2403 * 2052 *
2404 * For syscalls that create or remove filesys 2053 * For syscalls that create or remove filesystem objects, audit_inode
2405 * can only collect information for the files 2054 * can only collect information for the filesystem object's parent.
2406 * This call updates the audit context with t 2055 * This call updates the audit context with the child's information.
2407 * Syscalls that create a new filesystem obje 2056 * Syscalls that create a new filesystem object must be hooked after
2408 * the object is created. Syscalls that remo 2057 * the object is created. Syscalls that remove a filesystem object
2409 * must be hooked prior, in order to capture 2058 * must be hooked prior, in order to capture the target inode during
2410 * unsuccessful attempts. 2059 * unsuccessful attempts.
2411 */ 2060 */
2412 void __audit_inode_child(struct inode *parent 2061 void __audit_inode_child(struct inode *parent,
2413 const struct dentry 2062 const struct dentry *dentry,
2414 const unsigned char 2063 const unsigned char type)
2415 { 2064 {
2416 struct audit_context *context = audit 2065 struct audit_context *context = audit_context();
2417 struct inode *inode = d_backing_inode 2066 struct inode *inode = d_backing_inode(dentry);
2418 const struct qstr *dname = &dentry->d 2067 const struct qstr *dname = &dentry->d_name;
2419 struct audit_names *n, *found_parent 2068 struct audit_names *n, *found_parent = NULL, *found_child = NULL;
2420 struct audit_entry *e; 2069 struct audit_entry *e;
2421 struct list_head *list = &audit_filte 2070 struct list_head *list = &audit_filter_list[AUDIT_FILTER_FS];
2422 int i; 2071 int i;
2423 2072
2424 if (context->context == AUDIT_CTX_UNU !! 2073 if (!context->in_syscall)
2425 return; 2074 return;
2426 2075
2427 rcu_read_lock(); 2076 rcu_read_lock();
2428 list_for_each_entry_rcu(e, list, list 2077 list_for_each_entry_rcu(e, list, list) {
2429 for (i = 0; i < e->rule.field 2078 for (i = 0; i < e->rule.field_count; i++) {
2430 struct audit_field *f 2079 struct audit_field *f = &e->rule.fields[i];
2431 2080
2432 if (f->type == AUDIT_ 2081 if (f->type == AUDIT_FSTYPE
2433 && audit_comparat 2082 && audit_comparator(parent->i_sb->s_magic,
2434 2083 f->op, f->val)
2435 && e->rule.action 2084 && e->rule.action == AUDIT_NEVER) {
2436 rcu_read_unlo 2085 rcu_read_unlock();
2437 return; 2086 return;
2438 } 2087 }
2439 } 2088 }
2440 } 2089 }
2441 rcu_read_unlock(); 2090 rcu_read_unlock();
2442 2091
2443 if (inode) 2092 if (inode)
2444 handle_one(inode); 2093 handle_one(inode);
2445 2094
2446 /* look for a parent entry first */ 2095 /* look for a parent entry first */
2447 list_for_each_entry(n, &context->name 2096 list_for_each_entry(n, &context->names_list, list) {
2448 if (!n->name || 2097 if (!n->name ||
2449 (n->type != AUDIT_TYPE_PA 2098 (n->type != AUDIT_TYPE_PARENT &&
2450 n->type != AUDIT_TYPE_UN 2099 n->type != AUDIT_TYPE_UNKNOWN))
2451 continue; 2100 continue;
2452 2101
2453 if (n->ino == parent->i_ino & 2102 if (n->ino == parent->i_ino && n->dev == parent->i_sb->s_dev &&
2454 !audit_compare_dname_path 2103 !audit_compare_dname_path(dname,
2455 2104 n->name->name, n->name_len)) {
2456 if (n->type == AUDIT_ 2105 if (n->type == AUDIT_TYPE_UNKNOWN)
2457 n->type = AUD 2106 n->type = AUDIT_TYPE_PARENT;
2458 found_parent = n; 2107 found_parent = n;
2459 break; 2108 break;
2460 } 2109 }
2461 } 2110 }
2462 2111
2463 cond_resched(); <<
2464 <<
2465 /* is there a matching child entry? * 2112 /* is there a matching child entry? */
2466 list_for_each_entry(n, &context->name 2113 list_for_each_entry(n, &context->names_list, list) {
2467 /* can only match entries tha 2114 /* can only match entries that have a name */
2468 if (!n->name || 2115 if (!n->name ||
2469 (n->type != type && n->ty 2116 (n->type != type && n->type != AUDIT_TYPE_UNKNOWN))
2470 continue; 2117 continue;
2471 2118
2472 if (!strcmp(dname->name, n->n 2119 if (!strcmp(dname->name, n->name->name) ||
2473 !audit_compare_dname_path 2120 !audit_compare_dname_path(dname, n->name->name,
2474 2121 found_parent ?
2475 2122 found_parent->name_len :
2476 2123 AUDIT_NAME_FULL)) {
2477 if (n->type == AUDIT_ 2124 if (n->type == AUDIT_TYPE_UNKNOWN)
2478 n->type = typ 2125 n->type = type;
2479 found_child = n; 2126 found_child = n;
2480 break; 2127 break;
2481 } 2128 }
2482 } 2129 }
2483 2130
2484 if (!found_parent) { 2131 if (!found_parent) {
2485 /* create a new, "anonymous" 2132 /* create a new, "anonymous" parent record */
2486 n = audit_alloc_name(context, 2133 n = audit_alloc_name(context, AUDIT_TYPE_PARENT);
2487 if (!n) 2134 if (!n)
2488 return; 2135 return;
2489 audit_copy_inode(n, NULL, par 2136 audit_copy_inode(n, NULL, parent, 0);
2490 } 2137 }
2491 2138
2492 if (!found_child) { 2139 if (!found_child) {
2493 found_child = audit_alloc_nam 2140 found_child = audit_alloc_name(context, type);
2494 if (!found_child) 2141 if (!found_child)
2495 return; 2142 return;
2496 2143
2497 /* Re-use the name belonging 2144 /* Re-use the name belonging to the slot for a matching parent
2498 * directory. All names for t 2145 * directory. All names for this context are relinquished in
2499 * audit_free_names() */ 2146 * audit_free_names() */
2500 if (found_parent) { 2147 if (found_parent) {
2501 found_child->name = f 2148 found_child->name = found_parent->name;
2502 found_child->name_len 2149 found_child->name_len = AUDIT_NAME_FULL;
2503 atomic_inc(&found_chi !! 2150 found_child->name->refcnt++;
2504 } 2151 }
2505 } 2152 }
2506 2153
2507 if (inode) 2154 if (inode)
2508 audit_copy_inode(found_child, 2155 audit_copy_inode(found_child, dentry, inode, 0);
2509 else 2156 else
2510 found_child->ino = AUDIT_INO_ 2157 found_child->ino = AUDIT_INO_UNSET;
2511 } 2158 }
2512 EXPORT_SYMBOL_GPL(__audit_inode_child); 2159 EXPORT_SYMBOL_GPL(__audit_inode_child);
2513 2160
2514 /** 2161 /**
2515 * auditsc_get_stamp - get local copies of au 2162 * auditsc_get_stamp - get local copies of audit_context values
2516 * @ctx: audit_context for the task 2163 * @ctx: audit_context for the task
2517 * @t: timespec64 to store time recorded in t 2164 * @t: timespec64 to store time recorded in the audit_context
2518 * @serial: serial value that is recorded in 2165 * @serial: serial value that is recorded in the audit_context
2519 * 2166 *
2520 * Also sets the context as auditable. 2167 * Also sets the context as auditable.
2521 */ 2168 */
2522 int auditsc_get_stamp(struct audit_context *c 2169 int auditsc_get_stamp(struct audit_context *ctx,
2523 struct timespec64 *t, 2170 struct timespec64 *t, unsigned int *serial)
2524 { 2171 {
2525 if (ctx->context == AUDIT_CTX_UNUSED) !! 2172 if (!ctx->in_syscall)
2526 return 0; 2173 return 0;
2527 if (!ctx->serial) 2174 if (!ctx->serial)
2528 ctx->serial = audit_serial(); 2175 ctx->serial = audit_serial();
2529 t->tv_sec = ctx->ctime.tv_sec; 2176 t->tv_sec = ctx->ctime.tv_sec;
2530 t->tv_nsec = ctx->ctime.tv_nsec; 2177 t->tv_nsec = ctx->ctime.tv_nsec;
2531 *serial = ctx->serial; 2178 *serial = ctx->serial;
2532 if (!ctx->prio) { 2179 if (!ctx->prio) {
2533 ctx->prio = 1; 2180 ctx->prio = 1;
2534 ctx->current_state = AUDIT_ST !! 2181 ctx->current_state = AUDIT_RECORD_CONTEXT;
2535 } 2182 }
2536 return 1; 2183 return 1;
2537 } 2184 }
2538 2185
2539 /** 2186 /**
2540 * __audit_mq_open - record audit data for a 2187 * __audit_mq_open - record audit data for a POSIX MQ open
2541 * @oflag: open flag 2188 * @oflag: open flag
2542 * @mode: mode bits 2189 * @mode: mode bits
2543 * @attr: queue attributes 2190 * @attr: queue attributes
2544 * 2191 *
2545 */ 2192 */
2546 void __audit_mq_open(int oflag, umode_t mode, 2193 void __audit_mq_open(int oflag, umode_t mode, struct mq_attr *attr)
2547 { 2194 {
2548 struct audit_context *context = audit 2195 struct audit_context *context = audit_context();
2549 2196
2550 if (attr) 2197 if (attr)
2551 memcpy(&context->mq_open.attr 2198 memcpy(&context->mq_open.attr, attr, sizeof(struct mq_attr));
2552 else 2199 else
2553 memset(&context->mq_open.attr 2200 memset(&context->mq_open.attr, 0, sizeof(struct mq_attr));
2554 2201
2555 context->mq_open.oflag = oflag; 2202 context->mq_open.oflag = oflag;
2556 context->mq_open.mode = mode; 2203 context->mq_open.mode = mode;
2557 2204
2558 context->type = AUDIT_MQ_OPEN; 2205 context->type = AUDIT_MQ_OPEN;
2559 } 2206 }
2560 2207
2561 /** 2208 /**
2562 * __audit_mq_sendrecv - record audit data fo 2209 * __audit_mq_sendrecv - record audit data for a POSIX MQ timed send/receive
2563 * @mqdes: MQ descriptor 2210 * @mqdes: MQ descriptor
2564 * @msg_len: Message length 2211 * @msg_len: Message length
2565 * @msg_prio: Message priority 2212 * @msg_prio: Message priority
2566 * @abs_timeout: Message timeout in absolute 2213 * @abs_timeout: Message timeout in absolute time
2567 * 2214 *
2568 */ 2215 */
2569 void __audit_mq_sendrecv(mqd_t mqdes, size_t 2216 void __audit_mq_sendrecv(mqd_t mqdes, size_t msg_len, unsigned int msg_prio,
2570 const struct timespec 2217 const struct timespec64 *abs_timeout)
2571 { 2218 {
2572 struct audit_context *context = audit 2219 struct audit_context *context = audit_context();
2573 struct timespec64 *p = &context->mq_s 2220 struct timespec64 *p = &context->mq_sendrecv.abs_timeout;
2574 2221
2575 if (abs_timeout) 2222 if (abs_timeout)
2576 memcpy(p, abs_timeout, sizeof 2223 memcpy(p, abs_timeout, sizeof(*p));
2577 else 2224 else
2578 memset(p, 0, sizeof(*p)); 2225 memset(p, 0, sizeof(*p));
2579 2226
2580 context->mq_sendrecv.mqdes = mqdes; 2227 context->mq_sendrecv.mqdes = mqdes;
2581 context->mq_sendrecv.msg_len = msg_le 2228 context->mq_sendrecv.msg_len = msg_len;
2582 context->mq_sendrecv.msg_prio = msg_p 2229 context->mq_sendrecv.msg_prio = msg_prio;
2583 2230
2584 context->type = AUDIT_MQ_SENDRECV; 2231 context->type = AUDIT_MQ_SENDRECV;
2585 } 2232 }
2586 2233
2587 /** 2234 /**
2588 * __audit_mq_notify - record audit data for 2235 * __audit_mq_notify - record audit data for a POSIX MQ notify
2589 * @mqdes: MQ descriptor 2236 * @mqdes: MQ descriptor
2590 * @notification: Notification event 2237 * @notification: Notification event
2591 * 2238 *
2592 */ 2239 */
2593 2240
2594 void __audit_mq_notify(mqd_t mqdes, const str 2241 void __audit_mq_notify(mqd_t mqdes, const struct sigevent *notification)
2595 { 2242 {
2596 struct audit_context *context = audit 2243 struct audit_context *context = audit_context();
2597 2244
2598 if (notification) 2245 if (notification)
2599 context->mq_notify.sigev_sign 2246 context->mq_notify.sigev_signo = notification->sigev_signo;
2600 else 2247 else
2601 context->mq_notify.sigev_sign 2248 context->mq_notify.sigev_signo = 0;
2602 2249
2603 context->mq_notify.mqdes = mqdes; 2250 context->mq_notify.mqdes = mqdes;
2604 context->type = AUDIT_MQ_NOTIFY; 2251 context->type = AUDIT_MQ_NOTIFY;
2605 } 2252 }
2606 2253
2607 /** 2254 /**
2608 * __audit_mq_getsetattr - record audit data 2255 * __audit_mq_getsetattr - record audit data for a POSIX MQ get/set attribute
2609 * @mqdes: MQ descriptor 2256 * @mqdes: MQ descriptor
2610 * @mqstat: MQ flags 2257 * @mqstat: MQ flags
2611 * 2258 *
2612 */ 2259 */
2613 void __audit_mq_getsetattr(mqd_t mqdes, struc 2260 void __audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat)
2614 { 2261 {
2615 struct audit_context *context = audit 2262 struct audit_context *context = audit_context();
2616 <<
2617 context->mq_getsetattr.mqdes = mqdes; 2263 context->mq_getsetattr.mqdes = mqdes;
2618 context->mq_getsetattr.mqstat = *mqst 2264 context->mq_getsetattr.mqstat = *mqstat;
2619 context->type = AUDIT_MQ_GETSETATTR; 2265 context->type = AUDIT_MQ_GETSETATTR;
2620 } 2266 }
2621 2267
2622 /** 2268 /**
2623 * __audit_ipc_obj - record audit data for ip 2269 * __audit_ipc_obj - record audit data for ipc object
2624 * @ipcp: ipc permissions 2270 * @ipcp: ipc permissions
2625 * 2271 *
2626 */ 2272 */
2627 void __audit_ipc_obj(struct kern_ipc_perm *ip 2273 void __audit_ipc_obj(struct kern_ipc_perm *ipcp)
2628 { 2274 {
2629 struct audit_context *context = audit 2275 struct audit_context *context = audit_context();
2630 <<
2631 context->ipc.uid = ipcp->uid; 2276 context->ipc.uid = ipcp->uid;
2632 context->ipc.gid = ipcp->gid; 2277 context->ipc.gid = ipcp->gid;
2633 context->ipc.mode = ipcp->mode; 2278 context->ipc.mode = ipcp->mode;
2634 context->ipc.has_perm = 0; 2279 context->ipc.has_perm = 0;
2635 security_ipc_getsecid(ipcp, &context- 2280 security_ipc_getsecid(ipcp, &context->ipc.osid);
2636 context->type = AUDIT_IPC; 2281 context->type = AUDIT_IPC;
2637 } 2282 }
2638 2283
2639 /** 2284 /**
2640 * __audit_ipc_set_perm - record audit data f 2285 * __audit_ipc_set_perm - record audit data for new ipc permissions
2641 * @qbytes: msgq bytes 2286 * @qbytes: msgq bytes
2642 * @uid: msgq user id 2287 * @uid: msgq user id
2643 * @gid: msgq group id 2288 * @gid: msgq group id
2644 * @mode: msgq mode (permissions) 2289 * @mode: msgq mode (permissions)
2645 * 2290 *
2646 * Called only after audit_ipc_obj(). 2291 * Called only after audit_ipc_obj().
2647 */ 2292 */
2648 void __audit_ipc_set_perm(unsigned long qbyte 2293 void __audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, umode_t mode)
2649 { 2294 {
2650 struct audit_context *context = audit 2295 struct audit_context *context = audit_context();
2651 2296
2652 context->ipc.qbytes = qbytes; 2297 context->ipc.qbytes = qbytes;
2653 context->ipc.perm_uid = uid; 2298 context->ipc.perm_uid = uid;
2654 context->ipc.perm_gid = gid; 2299 context->ipc.perm_gid = gid;
2655 context->ipc.perm_mode = mode; 2300 context->ipc.perm_mode = mode;
2656 context->ipc.has_perm = 1; 2301 context->ipc.has_perm = 1;
2657 } 2302 }
2658 2303
2659 void __audit_bprm(struct linux_binprm *bprm) 2304 void __audit_bprm(struct linux_binprm *bprm)
2660 { 2305 {
2661 struct audit_context *context = audit 2306 struct audit_context *context = audit_context();
2662 2307
2663 context->type = AUDIT_EXECVE; 2308 context->type = AUDIT_EXECVE;
2664 context->execve.argc = bprm->argc; 2309 context->execve.argc = bprm->argc;
2665 } 2310 }
2666 2311
2667 2312
2668 /** 2313 /**
2669 * __audit_socketcall - record audit data for 2314 * __audit_socketcall - record audit data for sys_socketcall
2670 * @nargs: number of args, which should not b 2315 * @nargs: number of args, which should not be more than AUDITSC_ARGS.
2671 * @args: args array 2316 * @args: args array
2672 * 2317 *
2673 */ 2318 */
2674 int __audit_socketcall(int nargs, unsigned lo 2319 int __audit_socketcall(int nargs, unsigned long *args)
2675 { 2320 {
2676 struct audit_context *context = audit 2321 struct audit_context *context = audit_context();
2677 2322
2678 if (nargs <= 0 || nargs > AUDITSC_ARG 2323 if (nargs <= 0 || nargs > AUDITSC_ARGS || !args)
2679 return -EINVAL; 2324 return -EINVAL;
2680 context->type = AUDIT_SOCKETCALL; 2325 context->type = AUDIT_SOCKETCALL;
2681 context->socketcall.nargs = nargs; 2326 context->socketcall.nargs = nargs;
2682 memcpy(context->socketcall.args, args 2327 memcpy(context->socketcall.args, args, nargs * sizeof(unsigned long));
2683 return 0; 2328 return 0;
2684 } 2329 }
2685 2330
2686 /** 2331 /**
2687 * __audit_fd_pair - record audit data for pi 2332 * __audit_fd_pair - record audit data for pipe and socketpair
2688 * @fd1: the first file descriptor 2333 * @fd1: the first file descriptor
2689 * @fd2: the second file descriptor 2334 * @fd2: the second file descriptor
2690 * 2335 *
2691 */ 2336 */
2692 void __audit_fd_pair(int fd1, int fd2) 2337 void __audit_fd_pair(int fd1, int fd2)
2693 { 2338 {
2694 struct audit_context *context = audit 2339 struct audit_context *context = audit_context();
2695 <<
2696 context->fds[0] = fd1; 2340 context->fds[0] = fd1;
2697 context->fds[1] = fd2; 2341 context->fds[1] = fd2;
2698 } 2342 }
2699 2343
2700 /** 2344 /**
2701 * __audit_sockaddr - record audit data for s 2345 * __audit_sockaddr - record audit data for sys_bind, sys_connect, sys_sendto
2702 * @len: data length in user space 2346 * @len: data length in user space
2703 * @a: data address in kernel space 2347 * @a: data address in kernel space
2704 * 2348 *
2705 * Returns 0 for success or NULL context or < 2349 * Returns 0 for success or NULL context or < 0 on error.
2706 */ 2350 */
2707 int __audit_sockaddr(int len, void *a) 2351 int __audit_sockaddr(int len, void *a)
2708 { 2352 {
2709 struct audit_context *context = audit 2353 struct audit_context *context = audit_context();
2710 2354
2711 if (!context->sockaddr) { 2355 if (!context->sockaddr) {
2712 void *p = kmalloc(sizeof(stru 2356 void *p = kmalloc(sizeof(struct sockaddr_storage), GFP_KERNEL);
2713 <<
2714 if (!p) 2357 if (!p)
2715 return -ENOMEM; 2358 return -ENOMEM;
2716 context->sockaddr = p; 2359 context->sockaddr = p;
2717 } 2360 }
2718 2361
2719 context->sockaddr_len = len; 2362 context->sockaddr_len = len;
2720 memcpy(context->sockaddr, a, len); 2363 memcpy(context->sockaddr, a, len);
2721 return 0; 2364 return 0;
2722 } 2365 }
2723 2366
2724 void __audit_ptrace(struct task_struct *t) 2367 void __audit_ptrace(struct task_struct *t)
2725 { 2368 {
2726 struct audit_context *context = audit 2369 struct audit_context *context = audit_context();
2727 2370
2728 context->target_pid = task_tgid_nr(t) 2371 context->target_pid = task_tgid_nr(t);
2729 context->target_auid = audit_get_logi 2372 context->target_auid = audit_get_loginuid(t);
2730 context->target_uid = task_uid(t); 2373 context->target_uid = task_uid(t);
2731 context->target_sessionid = audit_get 2374 context->target_sessionid = audit_get_sessionid(t);
2732 security_task_getsecid_obj(t, &contex !! 2375 security_task_getsecid(t, &context->target_sid);
2733 memcpy(context->target_comm, t->comm, 2376 memcpy(context->target_comm, t->comm, TASK_COMM_LEN);
2734 } 2377 }
2735 2378
2736 /** 2379 /**
2737 * audit_signal_info_syscall - record signal 2380 * audit_signal_info_syscall - record signal info for syscalls
2738 * @t: task being signaled 2381 * @t: task being signaled
2739 * 2382 *
2740 * If the audit subsystem is being terminated 2383 * If the audit subsystem is being terminated, record the task (pid)
2741 * and uid that is doing that. 2384 * and uid that is doing that.
2742 */ 2385 */
2743 int audit_signal_info_syscall(struct task_str 2386 int audit_signal_info_syscall(struct task_struct *t)
2744 { 2387 {
2745 struct audit_aux_data_pids *axp; 2388 struct audit_aux_data_pids *axp;
2746 struct audit_context *ctx = audit_con 2389 struct audit_context *ctx = audit_context();
2747 kuid_t t_uid = task_uid(t); 2390 kuid_t t_uid = task_uid(t);
2748 2391
2749 if (!audit_signals || audit_dummy_con 2392 if (!audit_signals || audit_dummy_context())
2750 return 0; 2393 return 0;
2751 2394
2752 /* optimize the common case by puttin 2395 /* optimize the common case by putting first signal recipient directly
2753 * in audit_context */ 2396 * in audit_context */
2754 if (!ctx->target_pid) { 2397 if (!ctx->target_pid) {
2755 ctx->target_pid = task_tgid_n 2398 ctx->target_pid = task_tgid_nr(t);
2756 ctx->target_auid = audit_get_ 2399 ctx->target_auid = audit_get_loginuid(t);
2757 ctx->target_uid = t_uid; 2400 ctx->target_uid = t_uid;
2758 ctx->target_sessionid = audit 2401 ctx->target_sessionid = audit_get_sessionid(t);
2759 security_task_getsecid_obj(t, !! 2402 security_task_getsecid(t, &ctx->target_sid);
2760 memcpy(ctx->target_comm, t->c 2403 memcpy(ctx->target_comm, t->comm, TASK_COMM_LEN);
2761 return 0; 2404 return 0;
2762 } 2405 }
2763 2406
2764 axp = (void *)ctx->aux_pids; 2407 axp = (void *)ctx->aux_pids;
2765 if (!axp || axp->pid_count == AUDIT_A 2408 if (!axp || axp->pid_count == AUDIT_AUX_PIDS) {
2766 axp = kzalloc(sizeof(*axp), G 2409 axp = kzalloc(sizeof(*axp), GFP_ATOMIC);
2767 if (!axp) 2410 if (!axp)
2768 return -ENOMEM; 2411 return -ENOMEM;
2769 2412
2770 axp->d.type = AUDIT_OBJ_PID; 2413 axp->d.type = AUDIT_OBJ_PID;
2771 axp->d.next = ctx->aux_pids; 2414 axp->d.next = ctx->aux_pids;
2772 ctx->aux_pids = (void *)axp; 2415 ctx->aux_pids = (void *)axp;
2773 } 2416 }
2774 BUG_ON(axp->pid_count >= AUDIT_AUX_PI 2417 BUG_ON(axp->pid_count >= AUDIT_AUX_PIDS);
2775 2418
2776 axp->target_pid[axp->pid_count] = tas 2419 axp->target_pid[axp->pid_count] = task_tgid_nr(t);
2777 axp->target_auid[axp->pid_count] = au 2420 axp->target_auid[axp->pid_count] = audit_get_loginuid(t);
2778 axp->target_uid[axp->pid_count] = t_u 2421 axp->target_uid[axp->pid_count] = t_uid;
2779 axp->target_sessionid[axp->pid_count] 2422 axp->target_sessionid[axp->pid_count] = audit_get_sessionid(t);
2780 security_task_getsecid_obj(t, &axp->t !! 2423 security_task_getsecid(t, &axp->target_sid[axp->pid_count]);
2781 memcpy(axp->target_comm[axp->pid_coun 2424 memcpy(axp->target_comm[axp->pid_count], t->comm, TASK_COMM_LEN);
2782 axp->pid_count++; 2425 axp->pid_count++;
2783 2426
2784 return 0; 2427 return 0;
2785 } 2428 }
2786 2429
2787 /** 2430 /**
2788 * __audit_log_bprm_fcaps - store information 2431 * __audit_log_bprm_fcaps - store information about a loading bprm and relevant fcaps
2789 * @bprm: pointer to the bprm being processed 2432 * @bprm: pointer to the bprm being processed
2790 * @new: the proposed new credentials 2433 * @new: the proposed new credentials
2791 * @old: the old credentials 2434 * @old: the old credentials
2792 * 2435 *
2793 * Simply check if the proc already has the c 2436 * Simply check if the proc already has the caps given by the file and if not
2794 * store the priv escalation info for later a 2437 * store the priv escalation info for later auditing at the end of the syscall
2795 * 2438 *
2796 * -Eric 2439 * -Eric
2797 */ 2440 */
2798 int __audit_log_bprm_fcaps(struct linux_binpr 2441 int __audit_log_bprm_fcaps(struct linux_binprm *bprm,
2799 const struct cred 2442 const struct cred *new, const struct cred *old)
2800 { 2443 {
2801 struct audit_aux_data_bprm_fcaps *ax; 2444 struct audit_aux_data_bprm_fcaps *ax;
2802 struct audit_context *context = audit 2445 struct audit_context *context = audit_context();
2803 struct cpu_vfs_cap_data vcaps; 2446 struct cpu_vfs_cap_data vcaps;
2804 2447
2805 ax = kmalloc(sizeof(*ax), GFP_KERNEL) 2448 ax = kmalloc(sizeof(*ax), GFP_KERNEL);
2806 if (!ax) 2449 if (!ax)
2807 return -ENOMEM; 2450 return -ENOMEM;
2808 2451
2809 ax->d.type = AUDIT_BPRM_FCAPS; 2452 ax->d.type = AUDIT_BPRM_FCAPS;
2810 ax->d.next = context->aux; 2453 ax->d.next = context->aux;
2811 context->aux = (void *)ax; 2454 context->aux = (void *)ax;
2812 2455
2813 get_vfs_caps_from_disk(&nop_mnt_idmap !! 2456 get_vfs_caps_from_disk(bprm->file->f_path.dentry, &vcaps);
2814 bprm->file->f_ <<
2815 2457
2816 ax->fcap.permitted = vcaps.permitted; 2458 ax->fcap.permitted = vcaps.permitted;
2817 ax->fcap.inheritable = vcaps.inherita 2459 ax->fcap.inheritable = vcaps.inheritable;
2818 ax->fcap.fE = !!(vcaps.magic_etc & VF 2460 ax->fcap.fE = !!(vcaps.magic_etc & VFS_CAP_FLAGS_EFFECTIVE);
2819 ax->fcap.rootid = vcaps.rootid; 2461 ax->fcap.rootid = vcaps.rootid;
2820 ax->fcap_ver = (vcaps.magic_etc & VFS 2462 ax->fcap_ver = (vcaps.magic_etc & VFS_CAP_REVISION_MASK) >> VFS_CAP_REVISION_SHIFT;
2821 2463
2822 ax->old_pcap.permitted = old->cap_p 2464 ax->old_pcap.permitted = old->cap_permitted;
2823 ax->old_pcap.inheritable = old->cap_i 2465 ax->old_pcap.inheritable = old->cap_inheritable;
2824 ax->old_pcap.effective = old->cap_e 2466 ax->old_pcap.effective = old->cap_effective;
2825 ax->old_pcap.ambient = old->cap_a 2467 ax->old_pcap.ambient = old->cap_ambient;
2826 2468
2827 ax->new_pcap.permitted = new->cap_p 2469 ax->new_pcap.permitted = new->cap_permitted;
2828 ax->new_pcap.inheritable = new->cap_i 2470 ax->new_pcap.inheritable = new->cap_inheritable;
2829 ax->new_pcap.effective = new->cap_e 2471 ax->new_pcap.effective = new->cap_effective;
2830 ax->new_pcap.ambient = new->cap_a 2472 ax->new_pcap.ambient = new->cap_ambient;
2831 return 0; 2473 return 0;
2832 } 2474 }
2833 2475
2834 /** 2476 /**
2835 * __audit_log_capset - store information abo 2477 * __audit_log_capset - store information about the arguments to the capset syscall
2836 * @new: the new credentials 2478 * @new: the new credentials
2837 * @old: the old (current) credentials 2479 * @old: the old (current) credentials
2838 * 2480 *
2839 * Record the arguments userspace sent to sys 2481 * Record the arguments userspace sent to sys_capset for later printing by the
2840 * audit system if applicable 2482 * audit system if applicable
2841 */ 2483 */
2842 void __audit_log_capset(const struct cred *ne 2484 void __audit_log_capset(const struct cred *new, const struct cred *old)
2843 { 2485 {
2844 struct audit_context *context = audit 2486 struct audit_context *context = audit_context();
2845 <<
2846 context->capset.pid = task_tgid_nr(cu 2487 context->capset.pid = task_tgid_nr(current);
2847 context->capset.cap.effective = new 2488 context->capset.cap.effective = new->cap_effective;
2848 context->capset.cap.inheritable = new 2489 context->capset.cap.inheritable = new->cap_effective;
2849 context->capset.cap.permitted = new 2490 context->capset.cap.permitted = new->cap_permitted;
2850 context->capset.cap.ambient = new 2491 context->capset.cap.ambient = new->cap_ambient;
2851 context->type = AUDIT_CAPSET; 2492 context->type = AUDIT_CAPSET;
2852 } 2493 }
2853 2494
2854 void __audit_mmap_fd(int fd, int flags) 2495 void __audit_mmap_fd(int fd, int flags)
2855 { 2496 {
2856 struct audit_context *context = audit 2497 struct audit_context *context = audit_context();
2857 <<
2858 context->mmap.fd = fd; 2498 context->mmap.fd = fd;
2859 context->mmap.flags = flags; 2499 context->mmap.flags = flags;
2860 context->type = AUDIT_MMAP; 2500 context->type = AUDIT_MMAP;
2861 } 2501 }
2862 2502
2863 void __audit_openat2_how(struct open_how *how <<
2864 { <<
2865 struct audit_context *context = audit <<
2866 <<
2867 context->openat2.flags = how->flags; <<
2868 context->openat2.mode = how->mode; <<
2869 context->openat2.resolve = how->resol <<
2870 context->type = AUDIT_OPENAT2; <<
2871 } <<
2872 <<
2873 void __audit_log_kern_module(char *name) 2503 void __audit_log_kern_module(char *name)
2874 { 2504 {
2875 struct audit_context *context = audit 2505 struct audit_context *context = audit_context();
2876 2506
2877 context->module.name = kstrdup(name, 2507 context->module.name = kstrdup(name, GFP_KERNEL);
2878 if (!context->module.name) 2508 if (!context->module.name)
2879 audit_log_lost("out of memory 2509 audit_log_lost("out of memory in __audit_log_kern_module");
2880 context->type = AUDIT_KERN_MODULE; 2510 context->type = AUDIT_KERN_MODULE;
2881 } 2511 }
2882 2512
2883 void __audit_fanotify(u32 response, struct fa !! 2513 void __audit_fanotify(unsigned int response)
2884 { 2514 {
2885 /* {subj,obj}_trust values are {0,1,2 !! 2515 audit_log(audit_context(), GFP_KERNEL,
2886 switch (friar->hdr.type) { !! 2516 AUDIT_FANOTIFY, "resp=%u", response);
2887 case FAN_RESPONSE_INFO_NONE: <<
2888 audit_log(audit_context(), GF <<
2889 "resp=%u fan_type=% <<
2890 response, FAN_RESPO <<
2891 break; <<
2892 case FAN_RESPONSE_INFO_AUDIT_RULE: <<
2893 audit_log(audit_context(), GF <<
2894 "resp=%u fan_type=% <<
2895 response, friar->hd <<
2896 friar->subj_trust, <<
2897 } <<
2898 } 2517 }
2899 2518
2900 void __audit_tk_injoffset(struct timespec64 o 2519 void __audit_tk_injoffset(struct timespec64 offset)
2901 { 2520 {
2902 struct audit_context *context = audit !! 2521 audit_log(audit_context(), GFP_KERNEL, AUDIT_TIME_INJOFFSET,
2903 !! 2522 "sec=%lli nsec=%li",
2904 /* only set type if not already set b !! 2523 (long long)offset.tv_sec, offset.tv_nsec);
2905 if (!context->type) <<
2906 context->type = AUDIT_TIME_IN <<
2907 memcpy(&context->time.tk_injoffset, & <<
2908 } 2524 }
2909 2525
2910 void __audit_ntp_log(const struct audit_ntp_d !! 2526 static void audit_log_ntp_val(const struct audit_ntp_data *ad,
>> 2527 const char *op, enum audit_ntp_type type)
2911 { 2528 {
2912 struct audit_context *context = audit !! 2529 const struct audit_ntp_val *val = &ad->vals[type];
2913 int type; <<
2914 2530
2915 for (type = 0; type < AUDIT_NTP_NVALS !! 2531 if (val->newval == val->oldval)
2916 if (ad->vals[type].newval != !! 2532 return;
2917 /* unconditionally se !! 2533
2918 context->type = AUDIT !! 2534 audit_log(audit_context(), GFP_KERNEL, AUDIT_TIME_ADJNTPVAL,
2919 memcpy(&context->time !! 2535 "op=%s old=%lli new=%lli", op, val->oldval, val->newval);
2920 break; <<
2921 } <<
2922 } 2536 }
2923 2537
2924 void __audit_log_nfcfg(const char *name, u8 a !! 2538 void __audit_ntp_log(const struct audit_ntp_data *ad)
2925 enum audit_nfcfgop op, <<
2926 { 2539 {
2927 struct audit_buffer *ab; !! 2540 audit_log_ntp_val(ad, "offset", AUDIT_NTP_OFFSET);
2928 char comm[sizeof(current->comm)]; !! 2541 audit_log_ntp_val(ad, "freq", AUDIT_NTP_FREQ);
2929 !! 2542 audit_log_ntp_val(ad, "status", AUDIT_NTP_STATUS);
2930 ab = audit_log_start(audit_context(), !! 2543 audit_log_ntp_val(ad, "tai", AUDIT_NTP_TAI);
2931 if (!ab) !! 2544 audit_log_ntp_val(ad, "tick", AUDIT_NTP_TICK);
2932 return; !! 2545 audit_log_ntp_val(ad, "adjust", AUDIT_NTP_ADJUST);
2933 audit_log_format(ab, "table=%s family <<
2934 name, af, nentries, <<
2935 <<
2936 audit_log_format(ab, " pid=%u", task_ <<
2937 audit_log_task_context(ab); /* subj= <<
2938 audit_log_format(ab, " comm="); <<
2939 audit_log_untrustedstring(ab, get_tas <<
2940 audit_log_end(ab); <<
2941 } 2546 }
2942 EXPORT_SYMBOL_GPL(__audit_log_nfcfg); <<
2943 2547
2944 static void audit_log_task(struct audit_buffe 2548 static void audit_log_task(struct audit_buffer *ab)
2945 { 2549 {
2946 kuid_t auid, uid; 2550 kuid_t auid, uid;
2947 kgid_t gid; 2551 kgid_t gid;
2948 unsigned int sessionid; 2552 unsigned int sessionid;
2949 char comm[sizeof(current->comm)]; 2553 char comm[sizeof(current->comm)];
2950 2554
2951 auid = audit_get_loginuid(current); 2555 auid = audit_get_loginuid(current);
2952 sessionid = audit_get_sessionid(curre 2556 sessionid = audit_get_sessionid(current);
2953 current_uid_gid(&uid, &gid); 2557 current_uid_gid(&uid, &gid);
2954 2558
2955 audit_log_format(ab, "auid=%u uid=%u 2559 audit_log_format(ab, "auid=%u uid=%u gid=%u ses=%u",
2956 from_kuid(&init_user 2560 from_kuid(&init_user_ns, auid),
2957 from_kuid(&init_user 2561 from_kuid(&init_user_ns, uid),
2958 from_kgid(&init_user 2562 from_kgid(&init_user_ns, gid),
2959 sessionid); 2563 sessionid);
2960 audit_log_task_context(ab); 2564 audit_log_task_context(ab);
2961 audit_log_format(ab, " pid=%d comm=", 2565 audit_log_format(ab, " pid=%d comm=", task_tgid_nr(current));
2962 audit_log_untrustedstring(ab, get_tas 2566 audit_log_untrustedstring(ab, get_task_comm(comm, current));
2963 audit_log_d_path_exe(ab, current->mm) 2567 audit_log_d_path_exe(ab, current->mm);
2964 } 2568 }
2965 2569
2966 /** 2570 /**
2967 * audit_core_dumps - record information abou 2571 * audit_core_dumps - record information about processes that end abnormally
2968 * @signr: signal value 2572 * @signr: signal value
2969 * 2573 *
2970 * If a process ends with a core dump, someth 2574 * If a process ends with a core dump, something fishy is going on and we
2971 * should record the event for investigation. 2575 * should record the event for investigation.
2972 */ 2576 */
2973 void audit_core_dumps(long signr) 2577 void audit_core_dumps(long signr)
2974 { 2578 {
2975 struct audit_buffer *ab; 2579 struct audit_buffer *ab;
2976 2580
2977 if (!audit_enabled) 2581 if (!audit_enabled)
2978 return; 2582 return;
2979 2583
2980 if (signr == SIGQUIT) /* don't care 2584 if (signr == SIGQUIT) /* don't care for those */
2981 return; 2585 return;
2982 2586
2983 ab = audit_log_start(audit_context(), 2587 ab = audit_log_start(audit_context(), GFP_KERNEL, AUDIT_ANOM_ABEND);
2984 if (unlikely(!ab)) 2588 if (unlikely(!ab))
2985 return; 2589 return;
2986 audit_log_task(ab); 2590 audit_log_task(ab);
2987 audit_log_format(ab, " sig=%ld res=1" 2591 audit_log_format(ab, " sig=%ld res=1", signr);
2988 audit_log_end(ab); 2592 audit_log_end(ab);
2989 } 2593 }
2990 2594
2991 /** 2595 /**
2992 * audit_seccomp - record information about a 2596 * audit_seccomp - record information about a seccomp action
2993 * @syscall: syscall number 2597 * @syscall: syscall number
2994 * @signr: signal value 2598 * @signr: signal value
2995 * @code: the seccomp action 2599 * @code: the seccomp action
2996 * 2600 *
2997 * Record the information associated with a s 2601 * Record the information associated with a seccomp action. Event filtering for
2998 * seccomp actions that are not to be logged 2602 * seccomp actions that are not to be logged is done in seccomp_log().
2999 * Therefore, this function forces auditing i 2603 * Therefore, this function forces auditing independent of the audit_enabled
3000 * and dummy context state because seccomp ac 2604 * and dummy context state because seccomp actions should be logged even when
3001 * audit is not in use. 2605 * audit is not in use.
3002 */ 2606 */
3003 void audit_seccomp(unsigned long syscall, lon 2607 void audit_seccomp(unsigned long syscall, long signr, int code)
3004 { 2608 {
3005 struct audit_buffer *ab; 2609 struct audit_buffer *ab;
3006 2610
3007 ab = audit_log_start(audit_context(), 2611 ab = audit_log_start(audit_context(), GFP_KERNEL, AUDIT_SECCOMP);
3008 if (unlikely(!ab)) 2612 if (unlikely(!ab))
3009 return; 2613 return;
3010 audit_log_task(ab); 2614 audit_log_task(ab);
3011 audit_log_format(ab, " sig=%ld arch=% 2615 audit_log_format(ab, " sig=%ld arch=%x syscall=%ld compat=%d ip=0x%lx code=0x%x",
3012 signr, syscall_get_a 2616 signr, syscall_get_arch(current), syscall,
3013 in_compat_syscall(), 2617 in_compat_syscall(), KSTK_EIP(current), code);
3014 audit_log_end(ab); 2618 audit_log_end(ab);
3015 } 2619 }
3016 2620
3017 void audit_seccomp_actions_logged(const char 2621 void audit_seccomp_actions_logged(const char *names, const char *old_names,
3018 int res) 2622 int res)
3019 { 2623 {
3020 struct audit_buffer *ab; 2624 struct audit_buffer *ab;
3021 2625
3022 if (!audit_enabled) 2626 if (!audit_enabled)
3023 return; 2627 return;
3024 2628
3025 ab = audit_log_start(audit_context(), 2629 ab = audit_log_start(audit_context(), GFP_KERNEL,
3026 AUDIT_CONFIG_CHA 2630 AUDIT_CONFIG_CHANGE);
3027 if (unlikely(!ab)) 2631 if (unlikely(!ab))
3028 return; 2632 return;
3029 2633
3030 audit_log_format(ab, 2634 audit_log_format(ab,
3031 "op=seccomp-logging 2635 "op=seccomp-logging actions=%s old-actions=%s res=%d",
3032 names, old_names, re 2636 names, old_names, res);
3033 audit_log_end(ab); 2637 audit_log_end(ab);
3034 } 2638 }
3035 2639
3036 struct list_head *audit_killed_trees(void) 2640 struct list_head *audit_killed_trees(void)
3037 { 2641 {
3038 struct audit_context *ctx = audit_con 2642 struct audit_context *ctx = audit_context();
3039 if (likely(!ctx || ctx->context == AU !! 2643 if (likely(!ctx || !ctx->in_syscall))
3040 return NULL; 2644 return NULL;
3041 return &ctx->killed_trees; 2645 return &ctx->killed_trees;
3042 } 2646 }
3043 2647
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.