add REDIRECT

hc

2024-10-09 05e59e5fb0064c97a1c10921ecd549f2d4a58565

 kernel/security/apparmor/include/path.h
..
..
@@ -1,3 +1,4 @@
1
+/* SPDX-License-Identifier: GPL-2.0-only */
1
2
 /*
2
3
  * AppArmor security module
3
4
  *
..
..
@@ -5,16 +6,10 @@
5
6
  *
6
7
  * Copyright (C) 1998-2008 Novell/SUSE
7
8
  * Copyright 2009-2010 Canonical Ltd.
8
- *
9
- * This program is free software; you can redistribute it and/or
10
- * modify it under the terms of the GNU General Public License as
11
- * published by the Free Software Foundation, version 2 of the
12
- * License.
13
9
  */
14
10
 
15
11
 #ifndef __AA_PATH_H
16
12
 #define __AA_PATH_H
17
-
18
13
 
19
14
 enum path_flags {
20
15
 	PATH_IS_DIR = 0x1,		/* path is a directory */
..
..
@@ -30,64 +25,8 @@
30
25
 		 const char **name, const char **info,
31
26
 		 const char *disconnected);
32
27
 
33
-#define MAX_PATH_BUFFERS 2
34
-
35
-/* Per cpu buffers used during mediation */
36
-/* preallocated buffers to use during path lookups */
37
-struct aa_buffers {
38
-	char *buf[MAX_PATH_BUFFERS];
39
-};
40
-
41
-#include <linux/percpu.h>
42
-#include <linux/preempt.h>
43
-#include <linux/locallock.h>
44
-
45
-DECLARE_PER_CPU(struct aa_buffers, aa_buffers);
46
-DECLARE_LOCAL_IRQ_LOCK(aa_buffers_lock);
47
-
48
-#define ASSIGN(FN, A, X, N) ((X) = FN(A, N))
49
-#define EVAL1(FN, A, X) ASSIGN(FN, A, X, 0) /*X = FN(0)*/
50
-#define EVAL2(FN, A, X, Y...)	\
51
-	do { ASSIGN(FN, A, X, 1);  EVAL1(FN, A, Y); } while (0)
52
-#define EVAL(FN, A, X...) CONCATENATE(EVAL, COUNT_ARGS(X))(FN, A, X)
53
-
54
-#define for_each_cpu_buffer(I) for ((I) = 0; (I) < MAX_PATH_BUFFERS; (I)++)
55
-
56
-#ifdef CONFIG_PREEMPT_RT_BASE
57
-static inline void AA_BUG_PREEMPT_ENABLED(const char *s)
58
-{
59
-	struct local_irq_lock *lv;
60
-
61
-	lv = this_cpu_ptr(&aa_buffers_lock);
62
-	WARN_ONCE(lv->owner != current,
63
-		  "__get_buffer without aa_buffers_lock\n");
64
-}
65
-
66
-#elif defined(CONFIG_DEBUG_PREEMPT)
67
-#define AA_BUG_PREEMPT_ENABLED(X) AA_BUG(preempt_count() <= 0, X)
68
-#else
69
-#define AA_BUG_PREEMPT_ENABLED(X) /* nop */
70
-#endif
71
-
72
-#define __get_buffer(C, N) ({						\
73
-	AA_BUG_PREEMPT_ENABLED("__get_buffer without preempt disabled");  \
74
-	(C)->buf[(N)]; })
75
-
76
-#define __get_buffers(C, X...)    EVAL(__get_buffer, C, X)
77
-
78
-#define __put_buffers(X, Y...) ((void)&(X))
79
-
80
-#define get_buffers(X...)						\
81
-do {									\
82
-	struct aa_buffers *__cpu_var;					\
83
-	__cpu_var = get_locked_ptr(aa_buffers_lock, &aa_buffers);	\
84
-	__get_buffers(__cpu_var, X);					\
85
-} while (0)
86
-
87
-#define put_buffers(X, Y...)		\
88
-do {					\
89
-	__put_buffers(X, Y);		\
90
-	put_locked_ptr(aa_buffers_lock, &aa_buffers);	\
91
-} while (0)
28
+#define IN_ATOMIC true
29
+char *aa_get_buffer(bool in_atomic);
30
+void aa_put_buffer(char *buf);
92
31
 
93
32
 #endif /* __AA_PATH_H */