-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
This patch looks good to me. acked.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAk/JEAcACgkQrlYvE4MpobNn2gCeKc9t7gyu0dUs/A/QxGe8PIu4
Wg8AoN9mwj04yhKFYM7fKARYppvKMceh
=gvN8
-----END PGP SIGNATURE-----
>From 6aebc2eb9d02f3ac2dd7852b5192360d2b93d2bc Mon Sep 17 00:00:00 2001
From: Dan Walsh <dwalsh@xxxxxxxxxx>
Date: Fri, 2 Sep 2011 08:54:12 -0400
Subject: [PATCH 05/90] libselinux: FIXME Allow SELinux labelling to support
multiple prefix/subsets labeling, to reduce memory
and increase speed apps that support labeling on a
subset of directories
Needs review
Signed-off-by: Dan Walsh <dwalsh@xxxxxxxxxx>
NOT-Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
Acked-by: Dan Walsh <dwalsh@xxxxxxxxxx>
---
libselinux/include/selinux/label.h | 4 +++-
libselinux/include/selinux/selinux.h | 10 ++++++++-
libselinux/man/man3/matchpathcon.3 | 12 +++++++++-
libselinux/man/man3/selabel_open.3 | 8 ++++++-
libselinux/src/label_file.c | 41 ++++++++++++++++++++++++----------
libselinux/src/matchpathcon.c | 13 ++++++++---
libselinux/src/selinux_internal.h | 1 +
7 files changed, 70 insertions(+), 19 deletions(-)
diff --git a/libselinux/include/selinux/label.h b/libselinux/include/selinux/label.h
index 1a54307..f6eeb21 100644
--- a/libselinux/include/selinux/label.h
+++ b/libselinux/include/selinux/label.h
@@ -46,8 +46,10 @@ struct selabel_handle;
#define SELABEL_OPT_PATH 3
/* select a subset of the search space as an optimization (file backend) */
#define SELABEL_OPT_SUBSET 4
+/* like subset, but an array of subsets */
+#define SELABEL_OPT_PREFIXES 5
/* total number of options */
-#define SELABEL_NOPT 5
+#define SELABEL_NOPT 6
/*
* Label operations
diff --git a/libselinux/include/selinux/selinux.h b/libselinux/include/selinux/selinux.h
index 6f483c9..efdd032 100644
--- a/libselinux/include/selinux/selinux.h
+++ b/libselinux/include/selinux/selinux.h
@@ -139,7 +139,10 @@ struct av_decision {
/* Structure for passing options, used by AVC and label subsystems */
struct selinux_opt {
int type;
- const char *value;
+ union {
+ const char *value;
+ const char **values;
+ };
};
/* Callback facilities */
@@ -420,6 +423,11 @@ extern int matchpathcon_init(const char *path);
regexes that have stems that are prefixes of 'prefix'. */
extern int matchpathcon_init_prefix(const char *path, const char *prefix);
+/* Same as matchpathcon_init, but only load entries with
+ * regexes that have stems that are prefixes of the 'prefixes'
+ * array of entries. The last entry must be NULL. */
+extern int matchpathcon_init_prefixes(const char *patch, const char **prefixes);
+
/* Free the memory allocated by matchpathcon_init. */
extern void matchpathcon_fini(void);
diff --git a/libselinux/man/man3/matchpathcon.3 b/libselinux/man/man3/matchpathcon.3
index cdbb252..b6814ed 100644
--- a/libselinux/man/man3/matchpathcon.3
+++ b/libselinux/man/man3/matchpathcon.3
@@ -8,7 +8,9 @@ matchpathcon, matchpathcon_index \- get the default SELinux security context for
.BI "int matchpathcon_init(const char *" path ");"
-.BI "int matchpathcon_init_prefix(const char *" path ", const char *" subset ");"
+.BI "int matchpathcon_init_prefix(const char *" path ", const char *" prefix ");"
+
+.BI "int matchpathcon_init_prefixes(const char *" path ", const char **" prefixes ");"
.BI "int matchpathcon_fini(void);"
.sp
@@ -50,6 +52,14 @@ by
.I prefix.
.sp
+.B matchpathcon_init_prefixes
+is the same as
+.B matchpathcon_init_prefix
+but takes an array of
+.I prefixes
+instead of a single prefix. The last entry in the array must be NULL.
+
+.sp
.B matchpathcon_fini
frees the memory allocated by a prior call to
.B matchpathcon_init.
diff --git a/libselinux/man/man3/selabel_open.3 b/libselinux/man/man3/selabel_open.3
index 8674e37..89bb4d3 100644
--- a/libselinux/man/man3/selabel_open.3
+++ b/libselinux/man/man3/selabel_open.3
@@ -66,6 +66,13 @@ A non-null value for this option enables context validation. By default,
is used; a custom validation function can be provided via
.BR selinux_set_callback (3).
Note that an invalid context may not be treated as an error unless it is actually encountered during a lookup operation.
+.TP
+.B SELABEL_OPT_SUBSET
+A ":" separates string of path prefixes that tell the system to only loads entries with regular expressions that could match this strings. For example "/dev:/var/run:/tmp". This option can cause the system to use less memory and work faster, but you should only use paths that begin with a prefix.
+.TP
+.B SELABEL_OPT_PATH
+A string representing an alternate path the the regular expressions.
+.sp
.SH "BACKENDS"
@@ -99,4 +106,3 @@ Eamon Walsh <ewalsh@xxxxxxxxxxxxx>
.BR selabel_stats (3),
.BR selinux_set_callback (3),
.BR selinux (8)
-
diff --git a/libselinux/src/label_file.c b/libselinux/src/label_file.c
index 7bc46cc..82a608c 100644
--- a/libselinux/src/label_file.c
+++ b/libselinux/src/label_file.c
@@ -27,6 +27,7 @@
* Internals, mostly moved over from matchpathcon.c
*/
+#define MAX_PREFIX 100
/* A file security context specification. */
typedef struct spec {
struct selabel_lookup_rec lr; /* holds contexts for lookup result */
@@ -276,7 +277,7 @@ static int compile_regex(struct saved_data *data, spec_t *spec, char **errbuf)
static int process_line(struct selabel_handle *rec,
- const char *path, const char *prefix,
+ const char *path, const char **prefix_array,
char *line_buf, int pass, unsigned lineno)
{
int items, len;
@@ -310,12 +311,24 @@ static int process_line(struct selabel_handle *rec,
}
len = get_stem_from_spec(regex);
- if (len && prefix && strncmp(prefix, regex, len)) {
- /* Stem of regex does not match requested prefix, discard. */
- free(regex);
- free(type);
- free(context);
- return 0;
+ if (len && prefix_array[0]) {
+ int i = 0;
+ int found = 0;
+ while (i < MAX_PREFIX && prefix_array[i]) {
+ if (strncmp(prefix_array[i], regex, len) == 0) {
+ found = 1;
+ break;
+ }
+ i++;
+ }
+
+ if (! found) {
+ /* Stem of regex does not match requested prefix, discard. */
+ free(regex);
+ free(type);
+ free(context);
+ return 0;
+ }
}
if (pass == 1) {
@@ -397,7 +410,8 @@ static int init(struct selabel_handle *rec, struct selinux_opt *opts,
{
struct saved_data *data = (struct saved_data *)rec->data;
const char *path = NULL;
- const char *prefix = NULL;
+ const char *static_prefix_array[2] = {NULL, };
+ const char **prefix_array = static_prefix_array;
FILE *fp;
FILE *localfp = NULL;
FILE *homedirfp = NULL;
@@ -418,7 +432,10 @@ static int init(struct selabel_handle *rec, struct selinux_opt *opts,
path = opts[n].value;
break;
case SELABEL_OPT_SUBSET:
- prefix = opts[n].value;
+ static_prefix_array[0] = opts[n].value;
+ break;
+ case SELABEL_OPT_PREFIXES:
+ prefix_array = opts[n].values;
break;
case SELABEL_OPT_BASEONLY:
baseonly = !!opts[n].value;
@@ -481,7 +498,7 @@ static int init(struct selabel_handle *rec, struct selinux_opt *opts,
while (getline(&line_buf, &line_len, fp) > 0) {
if (data->nspec >= maxnspec)
break;
- status = process_line(rec, path, prefix, line_buf, pass, ++lineno);
+ status = process_line(rec, path, prefix_array, line_buf, pass, ++lineno);
if (status)
goto finish;
}
@@ -497,7 +514,7 @@ static int init(struct selabel_handle *rec, struct selinux_opt *opts,
while (getline(&line_buf, &line_len, homedirfp) > 0) {
if (data->nspec >= maxnspec)
break;
- status = process_line(rec, homedir_path, prefix, line_buf, pass, ++lineno);
+ status = process_line(rec, homedir_path, prefix_array, line_buf, pass, ++lineno);
if (status)
goto finish;
}
@@ -507,7 +524,7 @@ static int init(struct selabel_handle *rec, struct selinux_opt *opts,
while (getline(&line_buf, &line_len, localfp) > 0) {
if (data->nspec >= maxnspec)
break;
- status = process_line(rec, local_path, prefix, line_buf, pass, ++lineno);
+ status = process_line(rec, local_path, prefix_array, line_buf, pass, ++lineno);
if (status)
goto finish;
}
diff --git a/libselinux/src/matchpathcon.c b/libselinux/src/matchpathcon.c
index 8f200d4..c9201d4 100644
--- a/libselinux/src/matchpathcon.c
+++ b/libselinux/src/matchpathcon.c
@@ -306,7 +306,7 @@ static void matchpathcon_init_once(void)
destructor_key_initialized = 1;
}
-int matchpathcon_init_prefix(const char *path, const char *subset)
+int matchpathcon_init_prefixes(const char *path, const char **prefixes)
{
if (!mycanoncon)
mycanoncon = default_canoncon;
@@ -314,15 +314,22 @@ int matchpathcon_init_prefix(const char *path, const char *subset)
__selinux_once(once, matchpathcon_init_once);
__selinux_setspecific(destructor_key, (void *)1);
- options[SELABEL_OPT_SUBSET].type = SELABEL_OPT_SUBSET;
- options[SELABEL_OPT_SUBSET].value = subset;
+ options[SELABEL_OPT_PREFIXES].type = SELABEL_OPT_PREFIXES;
+ options[SELABEL_OPT_PREFIXES].values = prefixes;
options[SELABEL_OPT_PATH].type = SELABEL_OPT_PATH;
options[SELABEL_OPT_PATH].value = path;
hnd = selabel_open(SELABEL_CTX_FILE, options, SELABEL_NOPT);
return hnd ? 0 : -1;
}
+hidden_def(matchpathcon_init_prefixes)
+int matchpathcon_init_prefix(const char *path, const char *prefix)
+{
+ const char *prefixes[2] = { prefix, NULL };
+
+ return matchpathcon_init_prefixes(path, prefixes);
+}
hidden_def(matchpathcon_init_prefix)
int matchpathcon_init(const char *path)
diff --git a/libselinux/src/selinux_internal.h b/libselinux/src/selinux_internal.h
index 00df405..9e82991 100644
--- a/libselinux/src/selinux_internal.h
+++ b/libselinux/src/selinux_internal.h
@@ -82,6 +82,7 @@ hidden_proto(selinux_mkload_policy)
hidden_proto(selinux_path)
hidden_proto(selinux_check_passwd_access)
hidden_proto(selinux_check_securetty_context)
+ hidden_proto(matchpathcon_init_prefixes)
hidden_proto(matchpathcon_init_prefix)
hidden_proto(selinux_users_path)
hidden_proto(selinux_usersconf_path);
--
1.7.10.2
