Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
lsm: rework the LSM enable/disable setter/getter functions
In addition to style changes, rename set_enabled() to lsm_enabled_set()
and is_enabled() to lsm_is_enabled() to better fit within the LSM
initialization code.
Reviewed-by: Casey Schaufler <casey@schaufler-ca.com>
Reviewed-by: John Johansen <john.johhansen@canonical.com>
Reviewed-by: Mimi Zohar <zohar@linux.ibm.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
+31
-31
+31
-31
security/lsm_init.c
+31
-31
security/lsm_init.c
···
10
10
11
11
#include "lsm.h"
12
12
13
+
/* LSM enabled constants. */
14
+
static __initdata int lsm_enabled_true = 1;
15
+
static __initdata int lsm_enabled_false = 0;
16
+
13
17
/* Pointers to LSM sections defined in include/asm-generic/vmlinux.lds.h */
14
18
extern struct lsm_info __start_lsm_info[], __end_lsm_info[];
15
19
extern struct lsm_info __start_early_lsm_info[], __end_early_lsm_info[];
···
79
75
}
80
76
__setup("lsm.debug", lsm_debug_enable);
81
77
82
-
/* Mark an LSM's enabled flag. */
83
-
static int lsm_enabled_true __initdata = 1;
84
-
static int lsm_enabled_false __initdata = 0;
85
-
static void __init set_enabled(struct lsm_info *lsm, bool enabled)
78
+
/**
79
+
* lsm_enabled_set - Mark a LSM as enabled
80
+
* @lsm: LSM definition
81
+
* @enabled: enabled flag
82
+
*/
83
+
static void __init lsm_enabled_set(struct lsm_info *lsm, bool enabled)
86
84
{
87
85
/*
88
86
* When an LSM hasn't configured an enable variable, we can use
89
87
* a hard-coded location for storing the default enabled state.
90
88
*/
91
-
if (!lsm->enabled) {
92
-
if (enabled)
93
-
lsm->enabled = &lsm_enabled_true;
94
-
else
95
-
lsm->enabled = &lsm_enabled_false;
96
-
} else if (lsm->enabled == &lsm_enabled_true) {
97
-
if (!enabled)
98
-
lsm->enabled = &lsm_enabled_false;
99
-
} else if (lsm->enabled == &lsm_enabled_false) {
100
-
if (enabled)
101
-
lsm->enabled = &lsm_enabled_true;
89
+
if (!lsm->enabled ||
90
+
lsm->enabled == &lsm_enabled_true ||
91
+
lsm->enabled == &lsm_enabled_false) {
92
+
lsm->enabled = enabled ? &lsm_enabled_true : &lsm_enabled_false;
102
93
} else {
103
94
*lsm->enabled = enabled;
104
95
}
105
96
}
106
97
107
-
static inline bool is_enabled(struct lsm_info *lsm)
98
+
/**
99
+
* lsm_is_enabled - Determine if a LSM is enabled
100
+
* @lsm: LSM definition
101
+
*/
102
+
static inline bool lsm_is_enabled(struct lsm_info *lsm)
108
103
{
109
-
if (!lsm->enabled)
110
-
return false;
111
-
112
-
return *lsm->enabled;
104
+
return (lsm->enabled ? *lsm->enabled : false);
113
105
}
114
106
115
107
/* Is an LSM already listed in the ordered LSMs list? */
···
139
139
lsm_idlist[last_lsm++] = lsm->id;
140
140
141
141
init_debug("%s ordered: %s (%s)\n", from, lsm->id->name,
142
-
is_enabled(lsm) ? "enabled" : "disabled");
142
+
lsm_is_enabled(lsm) ? "enabled" : "disabled");
143
143
}
144
144
145
145
static void __init lsm_set_blob_size(int *need, int *lbs)
···
162
162
{
163
163
struct lsm_blob_sizes *blobs;
164
164
165
-
if (!is_enabled(lsm)) {
166
-
set_enabled(lsm, false);
165
+
if (!lsm_is_enabled(lsm)) {
166
+
lsm_enabled_set(lsm, false);
167
167
return;
168
168
} else if ((lsm->flags & LSM_FLAG_EXCLUSIVE) && lsm_exclusive) {
169
169
init_debug("exclusive disabled: %s\n", lsm->id->name);
170
-
set_enabled(lsm, false);
170
+
lsm_enabled_set(lsm, false);
171
171
return;
172
172
}
173
173
174
174
/* Mark the LSM as enabled. */
175
-
set_enabled(lsm, true);
175
+
lsm_enabled_set(lsm, true);
176
176
if ((lsm->flags & LSM_FLAG_EXCLUSIVE) && !lsm_exclusive) {
177
177
init_debug("exclusive chosen: %s\n", lsm->id->name);
178
178
lsm_exclusive = lsm;
···
206
206
/* Initialize a given LSM, if it is enabled. */
207
207
static void __init initialize_lsm(struct lsm_info *lsm)
208
208
{
209
-
if (is_enabled(lsm)) {
209
+
if (lsm_is_enabled(lsm)) {
210
210
int ret;
211
211
212
212
init_debug("initializing %s\n", lsm->id->name);
···
240
240
lsm_for_each_raw(major) {
241
241
if ((major->flags & LSM_FLAG_LEGACY_MAJOR) &&
242
242
strcmp(major->id->name, lsm_order_legacy) != 0) {
243
-
set_enabled(major, false);
243
+
lsm_enabled_set(major, false);
244
244
init_debug("security=%s disabled: %s (only one legacy major LSM)\n",
245
245
lsm_order_legacy, major->id->name);
246
246
}
···
286
286
lsm_for_each_raw(lsm) {
287
287
if (exists_ordered_lsm(lsm))
288
288
continue;
289
-
set_enabled(lsm, false);
289
+
lsm_enabled_set(lsm, false);
290
290
init_debug("%s skipped: %s (not in requested order)\n",
291
291
origin, lsm->id->name);
292
292
}
···
319
319
320
320
pr_info("initializing lsm=");
321
321
lsm_early_for_each_raw(early) {
322
-
if (is_enabled(early))
322
+
if (lsm_is_enabled(early))
323
323
pr_cont("%s%s",
324
324
first++ == 0 ? "" : ",", early->id->name);
325
325
}
326
326
lsm_order_for_each(lsm) {
327
-
if (is_enabled(*lsm))
327
+
if (lsm_is_enabled(*lsm))
328
328
pr_cont("%s%s",
329
329
first++ == 0 ? "" : ",", (*lsm)->id->name);
330
330
}
···
440
440
*/
441
441
lsm_early_for_each_raw(lsm) {
442
442
init_debug(" early started: %s (%s)\n", lsm->id->name,
443
-
is_enabled(lsm) ? "enabled" : "disabled");
443
+
lsm_is_enabled(lsm) ? "enabled" : "disabled");
444
444
}
445
445
446
446
/* Load LSMs in specified order. */