Skip to contentSkip to conversation

libselinux: android: fix lax service context lookup

PATCH In review Janis Danisevskis 3 participants 9 messages Sep 28, 2016 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libselinux: android: fix lax service context lookup

We use the same lookup function for service contexts that we use for property contexts. However, property contexts are namespace based and only compare the prefix. This may lead to service associations with a wrong label.

This patch introduces a stricter lookup function for services contexts. Now the service name must match the key of the service label exactly.

---
 libselinux/include/selinux/label.h      |  2 ++
 libselinux/src/label.c                  |  1 +
 libselinux/src/label_android_property.c | 50 +++++++++++++++++++++++++++++++++
 libselinux/src/label_internal.h         |  3 ++
 4 files changed, 56 insertions(+)
libselinux/include/selinux/label.h +2 -0
index f0b1e10..277287e 100644
@@ -34,6 +34,8 @@ struct selabel_handle;
 #define SELABEL_CTX_DB		3
 /* Android property service contexts */
 #define SELABEL_CTX_ANDROID_PROP 4
+/* Android service contexts */
+#define SELABEL_CTX_ANDROID_SERVICE 5
 
 /*
  * Available options
libselinux/src/label.c +1 -0
index 96a4ff1..eb0e766 100644
@@ -45,6 +45,7 @@ static selabel_initfunc initfuncs[] = {
 	CONFIG_X_BACKEND(selabel_x_init),
 	CONFIG_DB_BACKEND(selabel_db_init),
 	&selabel_property_init,
+	&selabel_service_init,
 };
 
 static void selabel_subs_fini(struct selabel_sub *ptr)
libselinux/src/label_android_property.c +50 -0

59 lines not on this page · raw message

libselinux/src/label_internal.h +3 -0
index 7c55531..6a9481a 100644
@@ -39,6 +39,9 @@ int selabel_db_init(struct selabel_handle *rec,
 int selabel_property_init(struct selabel_handle *rec,
 			    const struct selinux_opt *opts,
 			    unsigned nopts) hidden;
+int selabel_service_init(struct selabel_handle *rec,
+			    const struct selinux_opt *opts,
+			    unsigned nopts) hidden;
 
 /*
  * Labeling internal structures
Signature · 1 line
2.8.0.rc3.226.g39d4020
#1 lore raw
Quoted 48 lines · Janis Danisevskis

We use the same lookup function for service contexts that we use for property contexts. However, property contexts are namespace based and only compare the prefix. This may lead to service associations with a wrong label.

This patch introduces a stricter lookup function for services contexts. Now the service name must match the key of the service label exactly.

---
 libselinux/include/selinux/label.h      |  2 ++
 libselinux/src/label.c                  |  1 +
 libselinux/src/label_android_property.c | 50 +++++++++++++++++++++++++++++++++
 libselinux/src/label_internal.h         |  3 ++
 4 files changed, 56 insertions(+)
libselinux/include/selinux/label.h +2 -0
index f0b1e10..277287e 100644
@@ -34,6 +34,8 @@ struct selabel_handle;
 #define SELABEL_CTX_DB         3
 /* Android property service contexts */
 #define SELABEL_CTX_ANDROID_PROP 4
+/* Android service contexts */
+#define SELABEL_CTX_ANDROID_SERVICE 5
 
 /*
  * Available options
libselinux/src/label.c +1 -0
index 96a4ff1..eb0e766 100644
@@ -45,6 +45,7 @@ static selabel_initfunc initfuncs[] = {
        CONFIG_X_BACKEND(selabel_x_init),
        CONFIG_DB_BACKEND(selabel_db_init),
        &selabel_property_init,
+       &selabel_service_init,
 };
 
 static void selabel_subs_fini(struct selabel_sub *ptr)
libselinux/src/label_android_property.c +0 -0
index 290b438..69d6afd 100644

libselinux/src/label_android_property.c finish: · line 283

Quoted 5 lines
libselinux/src/label_android_property.c +2 -0
@@ -279,6 +279,38 @@ finish:
        return ret;
 }
 
+static struct selabel_lookup_rec *service_lookup(struct selabel_handle *rec,
+               const char *key, int __attribute__((unused)) type)

Is their a way to set type where we could still share the property_backend and choose on type if to be
a different match style? That's just a thought, and likely a dumb one, i'm full of those.

It has been mildly confusing explaining to some that property_context and service backends
have the same code underpinings and the naming isn't clear on that. I would suggest, moving
the common stuff from each backend into android_backend_common.c and .h and then just have
the deltas, which appear to be initialization and matching in the respective label_android_property.c
and label_android_service.c files.

Quoted 77 lines
libselinux/src/label_android_property.c +48 -0
+{
+       struct saved_data *data = (struct saved_data *)rec->data;
+       spec_t *spec_arr = data->spec_arr;
+       unsigned int i;
+       struct selabel_lookup_rec *ret = NULL;
+
+       if (!data->nspec) {
+               errno = ENOENT;
+               goto finish;
+       }
+
+       for (i = 0; i < data->nspec; i++) {
+               if (strcmp(spec_arr[i].property_key, key) == 0)
+                       break;
+               if (strcmp(spec_arr[i].property_key, "*") == 0)
+                       break;
+       }
+
+       if (i >= data->nspec) {
+               /* No matching specification. */
+               errno = ENOENT;
+               goto finish;
+       }
+
+       ret = &spec_arr[i].lr;
+
+finish:
+       return ret;
+}
+
 static void stats(struct selabel_handle __attribute__((unused)) *rec)
 {
        selinux_log(SELINUX_WARNING, "'stats' functionality not implemented.\n");
@@ -302,3 +334,21 @@ int selabel_property_init(struct selabel_handle *rec,
 
        return init(rec, opts, nopts);
 }
+
+int selabel_service_init(struct selabel_handle *rec,
+               const struct selinux_opt *opts, unsigned nopts)
+{
+       struct saved_data *data;
+
+       data = (struct saved_data *)malloc(sizeof(*data));
+       if (!data)
+               return -1;
+       memset(data, 0, sizeof(*data));
+
+       rec->data = data;
+       rec->func_close = &closef;
+       rec->func_stats = &stats;
+       rec->func_lookup = &service_lookup;
+
+       return init(rec, opts, nopts);
+}
libselinux/src/label_internal.h +3 -1
index 7c55531..6a9481a 100644
@@ -39,6 +39,9 @@ int selabel_db_init(struct selabel_handle *rec,
 int selabel_property_init(struct selabel_handle *rec,
                            const struct selinux_opt *opts,
                            unsigned nopts) hidden;
+int selabel_service_init(struct selabel_handle *rec,
+                           const struct selinux_opt *opts,
+                           unsigned nopts) hidden;
 
 /*
  * Labeling internal structures
--

2.8.0.rc3.226.g39d4020

_______________________________________________
Selinux mailing list
[email protected]
To unsubscribe, send email to [email protected].
To get help, send an email containing "help" to [email protected].

Signature · 3 lines
Respectfully,

William C Roberts
#2 lore raw
In reply to Janis Danisevskis
Quoted 10 lines · Janis Danisevskis

We use the same lookup function for service contexts that we use for property contexts. However, property contexts are namespace based and only compare the prefix. This may lead to service associations with a wrong label.

This patch introduces a stricter lookup function for services contexts. Now the service name must match the key of the service label exactly.

Quoted 7 lines
---
 libselinux/include/selinux/label.h      |  2 ++
 libselinux/src/label.c                  |  1 +
 libselinux/src/label_android_property.c | 50 +++++++++++++++++++++++++++++++++
 libselinux/src/label_internal.h         |  3 ++
 4 files changed, 56 insertions(+)

Normally each backend would go into its own file, so service would get its own. Alternatively, since we are unlikely to ever support one without the other, perhaps label_android_property.c should be renamed to label_android.c and contain all of the Android-unique backends.

Quoted 19 lines
libselinux/include/selinux/label.h +2 -0
index f0b1e10..277287e 100644
@@ -34,6 +34,8 @@ struct selabel_handle;
 #define SELABEL_CTX_DB		3
 /* Android property service contexts */
 #define SELABEL_CTX_ANDROID_PROP 4
+/* Android service contexts */
+#define SELABEL_CTX_ANDROID_SERVICE 5
 
 /*
  * Available options
libselinux/src/label.c +0 -0
index 96a4ff1..eb0e766 100644

libselinux/src/label.c static selabel_initfunc initfuncs[] = { · line 48

Quoted 4 lines
libselinux/src/label.c +1 -0
@@ -45,6 +45,7 @@ static selabel_initfunc initfuncs[] = {
 	CONFIG_X_BACKEND(selabel_x_init),
 	CONFIG_DB_BACKEND(selabel_db_init),
 	&selabel_property_init,
+	&selabel_service_init,

Wondering if we should support selective enablement of the property and service backends too, similar to what William introduced for media, x, and db so that he could disable them on Android (in our case, so we can disable property and service backends on Linux distributions).

Quoted 83 lines
libselinux/src/label.c +0 -0
 };
 
 static void selabel_subs_fini(struct selabel_sub *ptr)
libselinux/src/label_android_property.c +50 -0
index 290b438..69d6afd 100644
@@ -279,6 +279,38 @@ finish:
 	return ret;
 }
 
+static struct selabel_lookup_rec *service_lookup(struct selabel_handle *rec,
+		const char *key, int __attribute__((unused)) type)
+{
+	struct saved_data *data = (struct saved_data *)rec->data;
+	spec_t *spec_arr = data->spec_arr;
+	unsigned int i;
+	struct selabel_lookup_rec *ret = NULL;
+
+	if (!data->nspec) {
+		errno = ENOENT;
+		goto finish;
+	}
+
+	for (i = 0; i < data->nspec; i++) {
+		if (strcmp(spec_arr[i].property_key, key) == 0)
+			break;
+		if (strcmp(spec_arr[i].property_key, "*") == 0)
+			break;
+	}
+
+	if (i >= data->nspec) {
+		/* No matching specification. */
+		errno = ENOENT;
+		goto finish;
+	}
+
+	ret = &spec_arr[i].lr;
+
+finish:
+	return ret;
+}
+
 static void stats(struct selabel_handle __attribute__((unused)) *rec)
 {
 	selinux_log(SELINUX_WARNING, "'stats' functionality not implemented.\n");
@@ -302,3 +334,21 @@ int selabel_property_init(struct selabel_handle *rec,
 
 	return init(rec, opts, nopts);
 }
+
+int selabel_service_init(struct selabel_handle *rec,
+		const struct selinux_opt *opts, unsigned nopts)
+{
+	struct saved_data *data;
+
+	data = (struct saved_data *)malloc(sizeof(*data));
+	if (!data)
+		return -1;
+	memset(data, 0, sizeof(*data));
+
+	rec->data = data;
+	rec->func_close = &closef;
+	rec->func_stats = &stats;
+	rec->func_lookup = &service_lookup;
+
+	return init(rec, opts, nopts);
+}
libselinux/src/label_internal.h +3 -0
index 7c55531..6a9481a 100644
@@ -39,6 +39,9 @@ int selabel_db_init(struct selabel_handle *rec,
 int selabel_property_init(struct selabel_handle *rec,
 			    const struct selinux_opt *opts,
 			    unsigned nopts) hidden;
+int selabel_service_init(struct selabel_handle *rec,
+			    const struct selinux_opt *opts,
+			    unsigned nopts) hidden;
 
 /*
  * Labeling internal structures
#3 lore raw
Quoted 36 lines · Stephen Smalley
Quoted 10 lines · Janis Danisevskis

We use the same lookup function for service contexts that we use for property contexts. However, property contexts are namespace based and only compare the prefix. This may lead to service associations with a wrong label.

This patch introduces a stricter lookup function for services contexts. Now the service name must match the key of the service label exactly.

Quoted 7 lines
---
 libselinux/include/selinux/label.h      |  2 ++
 libselinux/src/label.c                  |  1 +
 libselinux/src/label_android_property.c | 50 +++++++++++++++++++++++++++++++++
 libselinux/src/label_internal.h         |  3 ++
 4 files changed, 56 insertions(+)

Normally each backend would go into its own file, so service would get its own. Alternatively, since we are unlikely to ever support one without the other, perhaps label_android_property.c should be renamed to label_android.c and contain all of the Android-unique backends.

Quoted 12 lines
libselinux/include/selinux/label.h +2 -0
index f0b1e10..277287e 100644
@@ -34,6 +34,8 @@ struct selabel_handle;
 #define SELABEL_CTX_DB               3
 /* Android property service contexts */
 #define SELABEL_CTX_ANDROID_PROP 4
+/* Android service contexts */
+#define SELABEL_CTX_ANDROID_SERVICE 5
 
Quoted 16 lines

libselinux/src/label.c static selabel_initfunc initfuncs[] = { · line 48

Quoted 11 lines
libselinux/include/selinux/label.h +0 -0
 /*
  * Available options
libselinux/src/label.c +1 -0
index 96a4ff1..eb0e766 100644
@@ -45,6 +45,7 @@ static selabel_initfunc initfuncs[] = {
      CONFIG_X_BACKEND(selabel_x_init),
      CONFIG_DB_BACKEND(selabel_db_init),
      &selabel_property_init,
+     &selabel_service_init,

Wondering if we should support selective enablement of the property and service backends too, similar to what William introduced for media, x, and db so that he could disable them on Android (in our case, so we can disable property and service backends on Linux distributions).

I was wondering that too, im for it. If ANDROID_HOST patch is applied, we should just set the defaults to strip them out and only on ANDROID_HOST=y add them in.

We'd also need to coordinate with the AOSP patches, but I can routinely update those
based on whats going on.

Quoted 90 lines
Quoted 75 lines
libselinux/src/label.c +0 -0
 };
 
 static void selabel_subs_fini(struct selabel_sub *ptr)
libselinux/src/label_android_property.c +50 -0
index 290b438..69d6afd 100644
@@ -279,6 +279,38 @@ finish:
      return ret;
 }
 
+static struct selabel_lookup_rec *service_lookup(struct selabel_handle *rec,
+             const char *key, int __attribute__((unused)) type)
+{
+     struct saved_data *data = (struct saved_data *)rec->data;
+     spec_t *spec_arr = data->spec_arr;
+     unsigned int i;
+     struct selabel_lookup_rec *ret = NULL;
+
+     if (!data->nspec) {
+             errno = ENOENT;
+             goto finish;
+     }
+
+     for (i = 0; i < data->nspec; i++) {
+             if (strcmp(spec_arr[i].property_key, key) == 0)
+                     break;
+             if (strcmp(spec_arr[i].property_key, "*") == 0)
+                     break;
+     }
+
+     if (i >= data->nspec) {
+             /* No matching specification. */
+             errno = ENOENT;
+             goto finish;
+     }
+
+     ret = &spec_arr[i].lr;
+
+finish:
+     return ret;
+}
+
 static void stats(struct selabel_handle __attribute__((unused)) *rec)
 {
      selinux_log(SELINUX_WARNING, "'stats' functionality not implemented.\n");
@@ -302,3 +334,21 @@ int selabel_property_init(struct selabel_handle *rec,
 
      return init(rec, opts, nopts);
 }
+
+int selabel_service_init(struct selabel_handle *rec,
+             const struct selinux_opt *opts, unsigned nopts)
+{
+     struct saved_data *data;
+
+     data = (struct saved_data *)malloc(sizeof(*data));
+     if (!data)
+             return -1;
+     memset(data, 0, sizeof(*data));
+
+     rec->data = data;
+     rec->func_close = &closef;
+     rec->func_stats = &stats;
+     rec->func_lookup = &service_lookup;
+
+     return init(rec, opts, nopts);
+}
libselinux/src/label_internal.h +0 -0
index 7c55531..6a9481a 100644

libselinux/src/label_internal.h int selabel_db_init(struct selabel_handle *rec, · line 47

Quoted 9 lines
libselinux/src/label_internal.h +3 -0
@@ -39,6 +39,9 @@ int selabel_db_init(struct selabel_handle *rec,
 int selabel_property_init(struct selabel_handle *rec,
                          const struct selinux_opt *opts,
                          unsigned nopts) hidden;
+int selabel_service_init(struct selabel_handle *rec,
+                         const struct selinux_opt *opts,
+                         unsigned nopts) hidden;
 
 /*
  * Labeling internal structures

_______________________________________________
Seandroid-list mailing list
[email protected]
To unsubscribe, send email to [email protected].
To get help, send an email containing "help" to [email protected].

Signature · 3 lines
Respectfully,

William C Roberts
#7 lore raw
In reply to Stephen Smalley
Quoted 20 lines · Stephen Smalley
Quoted 10 lines · Janis Danisevskis

We use the same lookup function for service contexts that we use for property contexts. However, property contexts are namespace based and only compare the prefix. This may lead to service associations with a wrong label.

This patch introduces a stricter lookup function for services contexts. Now the service name must match the key of the service label exactly.

Quoted 5 lines
---
 libselinux/include/selinux/label.h      |  2 ++
 libselinux/src/label.c                  |  1 +
 libselinux/src/label_android_property.c | 50

+++++++++++++++++++++++++++++++++

Quoted 2 lines
 libselinux/src/label_internal.h         |  3 ++
 4 files changed, 56 insertions(+)
Quoted 6 lines

Normally each backend would go into its own file, so service would get its own. Alternatively, since we are unlikely to ever support one without the other, perhaps label_android_property.c should be renamed to label_android.c and contain all of the Android-unique backends.

I was thinking along the same lines, was just eager to get home... I'll

send
a refactored patch by tomorrow.

Quoted 13 lines

Review

Quoted 2 lines
(quoted diff) +0 -0

b/libselinux/include/selinux/label.h

Quoted 10 lines

index f0b1e10..277287e 100644

libselinux/include/selinux/label.h +2 -0
@@ -34,6 +34,8 @@ struct selabel_handle;
 #define SELABEL_CTX_DB               3
 /* Android property service contexts */
 #define SELABEL_CTX_ANDROID_PROP 4
+/* Android service contexts */
+#define SELABEL_CTX_ANDROID_SERVICE 5
 
Quoted 17 lines

libselinux/src/label.c static selabel_initfunc initfuncs[] = { · line 48

Quoted 11 lines
libselinux/include/selinux/label.h +0 -0
 /*
  * Available options
libselinux/src/label.c +1 -0
index 96a4ff1..eb0e766 100644
@@ -45,6 +45,7 @@ static selabel_initfunc initfuncs[] = {
      CONFIG_X_BACKEND(selabel_x_init),
      CONFIG_DB_BACKEND(selabel_db_init),
      &selabel_property_init,
+     &selabel_service_init,

Wondering if we should support selective enablement of the property and service backends too, similar to what William introduced for media, x, and db so that he could disable them on Android (in our case, so we can disable property and service backends on Linux distributions).

Oh, that is what these wrappers are for :-) . Sure.

Quoted 91 lines

Review

Quoted 5 lines
libselinux/src/label.c +0 -0
 };
 
 static void selabel_subs_fini(struct selabel_sub *ptr)
(quoted diff) +0 -0

b/libselinux/src/label_android_property.c

libselinux/src/label_android_property.c finish: · line 282

Quoted 8 lines

index 290b438..69d6afd 100644

libselinux/src/label_android_property.c +1 -0
@@ -279,6 +279,38 @@ finish:
      return ret;
 }
 
+static struct selabel_lookup_rec *service_lookup(struct selabel_handle

*rec,

Quoted 24 lines
libselinux/src/label_android_property.c +24 -0
+             const char *key, int __attribute__((unused)) type)
+{
+     struct saved_data *data = (struct saved_data *)rec->data;
+     spec_t *spec_arr = data->spec_arr;
+     unsigned int i;
+     struct selabel_lookup_rec *ret = NULL;
+
+     if (!data->nspec) {
+             errno = ENOENT;
+             goto finish;
+     }
+
+     for (i = 0; i < data->nspec; i++) {
+             if (strcmp(spec_arr[i].property_key, key) == 0)
+                     break;
+             if (strcmp(spec_arr[i].property_key, "*") == 0)
+                     break;
+     }
+
+     if (i >= data->nspec) {
+             /* No matching specification. */
+             errno = ENOENT;
+             goto finish;
+     }

libselinux/src/label_android_property.c finish:

Quoted 10 lines
libselinux/src/label_android_property.c +7 -0
+
+     ret = &spec_arr[i].lr;
+
+finish:
+     return ret;
+}
+
 static void stats(struct selabel_handle __attribute__((unused)) *rec)
 {
      selinux_log(SELINUX_WARNING, "'stats' functionality not

implemented.\n");

libselinux/src/label_android_property.c int selabel_property_init(struct selabel_handle

Quoted 1 line
libselinux/src/label_android_property.c +0 -0
@@ -302,3 +334,21 @@ int selabel_property_init(struct selabel_handle

*rec,

libselinux/src/label_

Quoted 22 lines
libselinux/src/label_android_property.c +18 -0
      return init(rec, opts, nopts);
 }
+
+int selabel_service_init(struct selabel_handle *rec,
+             const struct selinux_opt *opts, unsigned nopts)
+{
+     struct saved_data *data;
+
+     data = (struct saved_data *)malloc(sizeof(*data));
+     if (!data)
+             return -1;
+     memset(data, 0, sizeof(*data));
+
+     rec->data = data;
+     rec->func_close = &closef;
+     rec->func_stats = &stats;
+     rec->func_lookup = &service_lookup;
+
+     return init(rec, opts, nopts);
+}
libselinux/src/label_ renamed from libselinux/src/label_internal.h +0 -0

internal.h

Quoted 14 lines

index 7c55531..6a9481a 100644

libselinux/src/label_internal.h +3 -0
@@ -39,6 +39,9 @@ int selabel_db_init(struct selabel_handle *rec,
 int selabel_property_init(struct selabel_handle *rec,
                          const struct selinux_opt *opts,
                          unsigned nopts) hidden;
+int selabel_service_init(struct selabel_handle *rec,
+                         const struct selinux_opt *opts,
+                         unsigned nopts) hidden;
 
 /*
  * Labeling internal structures
#4 lore raw
In reply to William Roberts
Quoted 54 lines · William Roberts
Quoted 36 lines · Stephen Smalley
Quoted 10 lines · Janis Danisevskis

We use the same lookup function for service contexts that we use for property contexts. However, property contexts are namespace based and only compare the prefix. This may lead to service associations with a wrong label.

This patch introduces a stricter lookup function for services contexts. Now the service name must match the key of the service label exactly.

Quoted 7 lines
---
 libselinux/include/selinux/label.h      |  2 ++
 libselinux/src/label.c                  |  1 +
 libselinux/src/label_android_property.c | 50 +++++++++++++++++++++++++++++++++
 libselinux/src/label_internal.h         |  3 ++
 4 files changed, 56 insertions(+)

Normally each backend would go into its own file, so service would get its own. Alternatively, since we are unlikely to ever support one without the other, perhaps label_android_property.c should be renamed to label_android.c and contain all of the Android-unique backends.

Quoted 12 lines
libselinux/include/selinux/label.h +2 -0
index f0b1e10..277287e 100644
@@ -34,6 +34,8 @@ struct selabel_handle;
 #define SELABEL_CTX_DB               3
 /* Android property service contexts */
 #define SELABEL_CTX_ANDROID_PROP 4
+/* Android service contexts */
+#define SELABEL_CTX_ANDROID_SERVICE 5
 
Quoted 16 lines

libselinux/src/label.c static selabel_initfunc initfuncs[] = { · line 48

Quoted 11 lines
libselinux/include/selinux/label.h +0 -0
 /*
  * Available options
libselinux/src/label.c +1 -0
index 96a4ff1..eb0e766 100644
@@ -45,6 +45,7 @@ static selabel_initfunc initfuncs[] = {
      CONFIG_X_BACKEND(selabel_x_init),
      CONFIG_DB_BACKEND(selabel_db_init),
      &selabel_property_init,
+     &selabel_service_init,

Wondering if we should support selective enablement of the property and service backends too, similar to what William introduced for media, x, and db so that he could disable them on Android (in our case, so we can disable property and service backends on Linux distributions).

Quoted 7 lines

I was wondering that too, im for it. If ANDROID_HOST patch is applied, we should just set the defaults to strip them out and only on ANDROID_HOST=y add them in.

We'd also need to coordinate with the AOSP patches, but I can routinely update those
based on whats going on.

I could be wrong, but I think we only need the property and service backends on the target, not on the build host. The file backend is needed on the build host to label the filesystem images when they are created. We are likely only building the property backend on the host because we don't allow conditionally excluding it presently.

OTOH, being able to look things up on the build host could be useful from a development POV, e.g. if you were to add utils/selabel_lookup to the build host targets and kept the property and service backends in the host libselinux, then one could check what would match a given key.

#5 lore raw
Quoted 63 lines · Stephen Smalley
Quoted 54 lines · William Roberts
Quoted 36 lines · Stephen Smalley
Quoted 10 lines · Janis Danisevskis

We use the same lookup function for service contexts that we use for property contexts. However, property contexts are namespace based and only compare the prefix. This may lead to service associations with a wrong label.

This patch introduces a stricter lookup function for services contexts. Now the service name must match the key of the service label exactly.

Quoted 7 lines
---
 libselinux/include/selinux/label.h      |  2 ++
 libselinux/src/label.c                  |  1 +
 libselinux/src/label_android_property.c | 50 +++++++++++++++++++++++++++++++++
 libselinux/src/label_internal.h         |  3 ++
 4 files changed, 56 insertions(+)

Normally each backend would go into its own file, so service would get its own. Alternatively, since we are unlikely to ever support one without the other, perhaps label_android_property.c should be renamed to label_android.c and contain all of the Android-unique backends.

Quoted 12 lines
libselinux/include/selinux/label.h +2 -0
index f0b1e10..277287e 100644
@@ -34,6 +34,8 @@ struct selabel_handle;
 #define SELABEL_CTX_DB               3
 /* Android property service contexts */
 #define SELABEL_CTX_ANDROID_PROP 4
+/* Android service contexts */
+#define SELABEL_CTX_ANDROID_SERVICE 5
 
Quoted 16 lines

libselinux/src/label.c static selabel_initfunc initfuncs[] = { · line 48

Quoted 11 lines
libselinux/include/selinux/label.h +0 -0
 /*
  * Available options
libselinux/src/label.c +1 -0
index 96a4ff1..eb0e766 100644
@@ -45,6 +45,7 @@ static selabel_initfunc initfuncs[] = {
      CONFIG_X_BACKEND(selabel_x_init),
      CONFIG_DB_BACKEND(selabel_db_init),
      &selabel_property_init,
+     &selabel_service_init,

Wondering if we should support selective enablement of the property and service backends too, similar to what William introduced for media, x, and db so that he could disable them on Android (in our case, so we can disable property and service backends on Linux distributions).

Quoted 7 lines

I was wondering that too, im for it. If ANDROID_HOST patch is applied, we should just set the defaults to strip them out and only on ANDROID_HOST=y add them in.

We'd also need to coordinate with the AOSP patches, but I can routinely update those
based on whats going on.

Quoted 5 lines

I could be wrong, but I think we only need the property and service backends on the target, not on the build host. The file backend is needed on the build host to label the filesystem images when they are created. We are likely only building the property backend on the host because we don't allow conditionally excluding it presently.

checkfc I thought uses them for checking property and service backends?

Quoted 5 lines

OTOH, being able to look things up on the build host could be useful from a development POV, e.g. if you were to add utils/selabel_lookup to the build host targets and kept the property and service backends in the host libselinux, then one could check what would match a given key.

Signature · 3 lines
Respectfully,

William C Roberts
#6 lore raw
Quoted 64 lines · William Roberts
Quoted 63 lines · Stephen Smalley
Quoted 61 lines · William Roberts
Quoted 36 lines · Stephen Smalley
Quoted 10 lines · Janis Danisevskis

We use the same lookup function for service contexts that we use for property contexts. However, property contexts are namespace based and only compare the prefix. This may lead to service associations with a wrong label.

This patch introduces a stricter lookup function for services contexts. Now the service name must match the key of the service label exactly.

Quoted 7 lines
---
 libselinux/include/selinux/label.h      |  2 ++
 libselinux/src/label.c                  |  1 +
 libselinux/src/label_android_property.c | 50 +++++++++++++++++++++++++++++++++
 libselinux/src/label_internal.h         |  3 ++
 4 files changed, 56 insertions(+)

Normally each backend would go into its own file, so service would get its own. Alternatively, since we are unlikely to ever support one without the other, perhaps label_android_property.c should be renamed to label_android.c and contain all of the Android-unique backends.

Quoted 12 lines
libselinux/include/selinux/label.h +2 -0
index f0b1e10..277287e 100644
@@ -34,6 +34,8 @@ struct selabel_handle;
 #define SELABEL_CTX_DB               3
 /* Android property service contexts */
 #define SELABEL_CTX_ANDROID_PROP 4
+/* Android service contexts */
+#define SELABEL_CTX_ANDROID_SERVICE 5
 
Quoted 16 lines

libselinux/src/label.c static selabel_initfunc initfuncs[] = { · line 48

Quoted 11 lines
libselinux/include/selinux/label.h +0 -0
 /*
  * Available options
libselinux/src/label.c +1 -0
index 96a4ff1..eb0e766 100644
@@ -45,6 +45,7 @@ static selabel_initfunc initfuncs[] = {
      CONFIG_X_BACKEND(selabel_x_init),
      CONFIG_DB_BACKEND(selabel_db_init),
      &selabel_property_init,
+     &selabel_service_init,

Wondering if we should support selective enablement of the property and service backends too, similar to what William introduced for media, x, and db so that he could disable them on Android (in our case, so we can disable property and service backends on Linux distributions).

I was wondering that too, im for it. If ANDROID_HOST patch is applied, we should just set the defaults to strip them out and only on ANDROID_HOST=y add them in.

We'd also need to coordinate with the AOSP patches, but I can routinely update those
based on whats going on.

Quoted 7 lines
Quoted 5 lines

I could be wrong, but I think we only need the property and service backends on the target, not on the build host. The file backend is needed on the build host to label the filesystem images when they are created. We are likely only building the property backend on the host because we don't allow conditionally excluding it presently.

checkfc I thought uses them for checking property and service backends?

Ah, you're right. Never mind...

#8 lore raw
In reply to Janis Danisevskis
Quoted 24 lines · Janis Danisevskis

On Wed, Sep 28, 2016 at 5:17 PM, Stephen Smalley <[email protected] <mailto:[email protected]>> wrote:

On 09/28/2016 12:04 PM, Janis Danisevskis wrote:
> We use the same lookup function for service contexts
> that we use for property contexts. However, property
> contexts are namespace based and only compare the
> prefix. This may lead to service associations with
> a wrong label.
>
> This patch introduces a stricter lookup function for
> services contexts. Now the service name must match
> the key of the service label exactly.
>
> Signed-off-by: Janis Danisevskis <[email protected] <mailto:[email protected]>> > ---
> libselinux/include/selinux/label.h | 2 ++
> libselinux/src/label.c | 1 +
> libselinux/src/label_android_property.c | 50 +++++++++++++++++++++++++++++++++
> libselinux/src/label_internal.h | 3 ++
> 4 files changed, 56 insertions(+)

Quoted 7 lines

Normally each backend would go into its own file, so service would get its own. Alternatively, since we are unlikely to ever support one without the other, perhaps label_android_property.c should be renamed to label_android.c and contain all of the Android-unique backends.

I was thinking along the same lines, was just eager to get home... I'll send a refactored patch by tomorrow.

Also, please update libselinux/utils/selabel_lookup.c and selabel_digest.c to know about your new backend.

Quoted 134 lines
Quoted 21 lines
libselinux/include/selinux/label.h +2 -0
index f0b1e10..277287e 100644
@@ -34,6 +34,8 @@ struct selabel_handle;
 #define SELABEL_CTX_DB               3
 /* Android property service contexts */
 #define SELABEL_CTX_ANDROID_PROP 4
+/* Android service contexts */
+#define SELABEL_CTX_ANDROID_SERVICE 5
 
 /*
  * Available options
libselinux/src/label.c +0 -0
index 96a4ff1..eb0e766 100644

libselinux/src/label.c static selabel_initfunc initfuncs[] = { · line 48

Quoted 4 lines
libselinux/src/label.c +1 -0
@@ -45,6 +45,7 @@ static selabel_initfunc initfuncs[] = {
      CONFIG_X_BACKEND(selabel_x_init),
      CONFIG_DB_BACKEND(selabel_db_init),
      &selabel_property_init,
+     &selabel_service_init,

Wondering if we should support selective enablement of the property and service backends too, similar to what William introduced for media, x, and db so that he could disable them on Android (in our case, so we can disable property and service backends on Linux distributions).

Oh, that is what these wrappers are for :-) . Sure.

Review

Quoted 4 lines
libselinux/src/label.c +0 -0
 };
 
 static void selabel_subs_fini(struct selabel_sub *ptr)
(quoted diff) +0 -0
    b/libselinux/src/label_android_property.c
    > index 290b438..69d6afd 100644
    > --- a/libselinux/src/label_android_property.c
    > +++ b/libselinux/src/label_android_property.c
    > @@ -279,6 +279,38 @@ finish:
    >       return ret;
    >  }
    >
    > +static struct selabel_lookup_rec *service_lookup(struct
    selabel_handle *rec,
    > +             const char *key, int __attribute__((unused)) type)
    > +{
    > +     struct saved_data *data = (struct saved_data *)rec->data;
    > +     spec_t *spec_arr = data->spec_arr;
    > +     unsigned int i;
    > +     struct selabel_lookup_rec *ret = NULL;
    > +
    > +     if (!data->nspec) {
    > +             errno = ENOENT;
    > +             goto finish;
    > +     }
    > +
    > +     for (i = 0; i < data->nspec; i++) {
    > +             if (strcmp(spec_arr[i].property_key, key) == 0)
    > +                     break;
    > +             if (strcmp(spec_arr[i].property_key, "*") == 0)
    > +                     break;
    > +     }
    > +
    > +     if (i >= data->nspec) {
    > +             /* No matching specification. */
    > +             errno = ENOENT;
    > +             goto finish;
    > +     }
    > +
    > +     ret = &spec_arr[i].lr;
    > +
    > +finish:
    > +     return ret;
    > +}
    > +
    >  static void stats(struct selabel_handle __attribute__((unused)) *rec)
    >  {
    >       selinux_log(SELINUX_WARNING, "'stats' functionality not
    implemented.\n");
    > @@ -302,3 +334,21 @@ int selabel_property_init(struct
    selabel_handle *rec,
    >
    >       return init(rec, opts, nopts);
    >  }
    > +
    > +int selabel_service_init(struct selabel_handle *rec,
    > +             const struct selinux_opt *opts, unsigned nopts)
    > +{
    > +     struct saved_data *data;
    > +
    > +     data = (struct saved_data *)malloc(sizeof(*data));
    > +     if (!data)
    > +             return -1;
    > +     memset(data, 0, sizeof(*data));
    > +
    > +     rec->data = data;
    > +     rec->func_close = &closef;
    > +     rec->func_stats = &stats;
    > +     rec->func_lookup = &service_lookup;
    > +
    > +     return init(rec, opts, nopts);
    > +}
    > diff --git a/libselinux/src/label_internal.h
    b/libselinux/src/label_internal.h
    > index 7c55531..6a9481a 100644
    > --- a/libselinux/src/label_internal.h
    > +++ b/libselinux/src/label_internal.h
    > @@ -39,6 +39,9 @@ int selabel_db_init(struct selabel_handle *rec,
    >  int selabel_property_init(struct selabel_handle *rec,
    >                           const struct selinux_opt *opts,
    >                           unsigned nopts) hidden;
    > +int selabel_service_init(struct selabel_handle *rec,
    > +                         const struct selinux_opt *opts,
    > +                         unsigned nopts) hidden;
    >
    >  /*
    >   * Labeling internal structures
    >

_______________________________________________
Selinux mailing list
[email protected]
To unsubscribe, send email to [email protected].
To get help, send an email containing "help" to [email protected].