Skip to contentSkip to conversation

libselinux: accept const fromcon in get_context API

PATCH In review Christian Göttsche 2 participants 4 messages Jan 8, 2021 – Jan 21, 2021 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 libselinux: accept const fromcon in get_context API

Rework the APIs in <selinux/get_context_list.h> to take a constant string as from context.

The passed string is not modified currently but not declared const, which is restricting callers (who care about const-correctness).

---
 libselinux/include/selinux/get_context_list.h | 12 ++---
 .../man/man3/get_ordered_context_list.3       | 12 ++---
 libselinux/src/get_context_list.c             | 49 +++++++++----------
 3 files changed, 36 insertions(+), 37 deletions(-)
libselinux/include/selinux/get_context_list.h +6 -6
index db8641a4..6b2f14f3 100644
@@ -17,14 +17,14 @@ extern "C" {
    If 'fromcon' is NULL, defaults to current context.
    Caller must free via freeconary. */
 	extern int get_ordered_context_list(const char *user,
-					    char * fromcon,
+					    const char *fromcon,
 					    char *** list);
 
 /* As above, but use the provided MLS level rather than the
    default level for the user. */
 	extern int get_ordered_context_list_with_level(const char *user,
 						       const char *level,
-						       char * fromcon,
+						       const char *fromcon,
 						       char *** list);
 
 /* Get the default security context for a user session for 'user'
@@ -35,14 +35,14 @@ extern "C" {
    Returns 0 on success or -1 otherwise.
    Caller must free via freecon. */
 	extern int get_default_context(const char *user,
-				       char * fromcon,
+				       const char *fromcon,
 				       char ** newcon);
 
 /* As above, but use the provided MLS level rather than the
    default level for the user. */
 	extern int get_default_context_with_level(const char *user,
 						  const char *level,
-						  char * fromcon,
+						  const char *fromcon,
 						  char ** newcon);
 
 /* Same as get_default_context, but only return a context
@@ -50,7 +50,7 @@ extern "C" {
    for the user with that role, then return -1. */
 	extern int get_default_context_with_role(const char *user,
 						 const char *role,
-						 char * fromcon,
+						 const char *fromcon,
 						 char ** newcon);
 
 /* Same as get_default_context, but only return a context
@@ -59,7 +59,7 @@ extern "C" {
 	extern int get_default_context_with_rolelevel(const char *user,
 						      const char *role,
 						      const char *level,
-						      char * fromcon,
+						      const char *fromcon,
 						      char ** newcon);
 
 /* Given a list of authorized security contexts for the user, 
libselinux/man/man3/get_ordered_context_list.3 +6 -6
index 3ed14a96..2a1e08f0 100644
@@ -7,17 +7,17 @@ get_ordered_context_list, get_ordered_context_list_with_level, get_default_conte
 .br
 .B #include <selinux/get_context_list.h>
 .sp
-.BI "int get_ordered_context_list(const char *" user ", char *" fromcon ", char ***" list );
+.BI "int get_ordered_context_list(const char *" user ", const char *" fromcon ", char ***" list );
 .sp
-.BI "int get_ordered_context_list_with_level(const char *" user ", const char *" level ", char *" fromcon ", char ***" list );
+.BI "int get_ordered_context_list_with_level(const char *" user ", const char *" level ", const char *" fromcon ", char ***" list );
 .sp
-.BI "int get_default_context(const char *" user ", char *" fromcon ", char **" newcon );
+.BI "int get_default_context(const char *" user ", const char *" fromcon ", char **" newcon );
 .sp
-.BI "int get_default_context_with_level(const char *" user ", const char *" level ", char *" fromcon ", char **" newcon );
+.BI "int get_default_context_with_level(const char *" user ", const char *" level ", const char *" fromcon ", char **" newcon );
 .sp
-.BI "int get_default_context_with_role(const char *" user ", const char *" role ", char *" fromcon ", char **" newcon ");
+.BI "int get_default_context_with_role(const char *" user ", const char *" role ", const char *" fromcon ", char **" newcon ");
 .sp
-.BI "int get_default_context_with_rolelevel(const char *" user ", const char *" role ", const char *" level ", char *" fromcon ", char **" newcon ");
+.BI "int get_default_context_with_rolelevel(const char *" user ", const char *" role ", const char *" level ", const char *" fromcon ", char **" newcon ");
 .sp
 .BI "int query_user_context(char **" list ", char **" newcon );
 .sp
libselinux/src/get_context_list.c +24 -25

142 lines not on this page · raw message

Signature · 1 line
2.30.0
#1 lore raw

PATCH 2/2 libselinux: update getseuser

- Bail out if not running on a SELinux enabled system
- Check whether the passed context is valid
- Do not report a get_ordered_context_list_with_level failure on zero found contexts

---
 libselinux/utils/getseuser.c | 47 +++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 14 deletions(-)
libselinux/utils/getseuser.c +33 -14
index 9193fe0a..ce1b7b27 100644
@@ -9,32 +9,51 @@ int main(int argc, char **argv)
 {
 	char *seuser = NULL, *level = NULL;
 	char **contextlist;
-	int rc, n, i;
+	int rc, n;
 
 	if (argc != 3) {
 		fprintf(stderr, "usage:  %s linuxuser fromcon\n", argv[0]);
-		exit(1);
+		return 1;
+	}
+
+	if (!is_selinux_enabled()) {
+		fprintf(stderr, "%s may be used only on a SELinux enabled kernel.\n", argv[0]);
+		return 4;
 	}
 
 	rc = getseuserbyname(argv[1], &seuser, &level);
 	if (rc) {
-		fprintf(stderr, "getseuserbyname failed:  %s\n",
-			strerror(errno));
-		exit(2);
+		fprintf(stderr, "getseuserbyname failed:  %s\n", strerror(errno));
+		return 2;
 	}
 	printf("seuser:  %s, level %s\n", seuser, level);
-	n = get_ordered_context_list_with_level(seuser, level, argv[2],
-						&contextlist);
-	if (n <= 0) {
-		fprintf(stderr,
-			"get_ordered_context_list_with_level failed:  %s\n",
-			strerror(errno));
-		exit(3);
+
+	rc = security_check_context(argv[2]);
+	if (rc) {
+		fprintf(stderr, "context '%s' is invalid\n", argv[2]);
+		free(seuser);
+		free(level);
+		return 5;
+	}
+
+	n = get_ordered_context_list_with_level(seuser, level, argv[2], &contextlist);
+	if (n < 0) {
+		fprintf(stderr, "get_ordered_context_list_with_level failed:  %s\n", strerror(errno));
+		free(seuser);
+		free(level);
+		return 3;
 	}
+
 	free(seuser);
 	free(level);
-	for (i = 0; i < n; i++)
+
+	if (n == 0)
+		printf("no valid context found\n");
+
+	for (int i = 0; i < n; i++)
 		printf("Context %d\t%s\n", i, contextlist[i]);
+
 	freeconary(contextlist);
-	exit(EXIT_SUCCESS);
+
+	return EXIT_SUCCESS;
 }
Signature · 1 line
2.30.0
#2 lore raw

Re: [PATCH 2/2] libselinux: update getseuser

Quoted 82 lines · Christian Göttsche

- Bail out if not running on a SELinux enabled system
- Check whether the passed context is valid
- Do not report a get_ordered_context_list_with_level failure on zero found contexts

---
 libselinux/utils/getseuser.c | 47 +++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 14 deletions(-)
libselinux/utils/getseuser.c +33 -15
index 9193fe0a..ce1b7b27 100644
@@ -9,32 +9,51 @@ int main(int argc, char **argv)
 {
        char *seuser = NULL, *level = NULL;
        char **contextlist;
-       int rc, n, i;
+       int rc, n;
 
        if (argc != 3) {
                fprintf(stderr, "usage:  %s linuxuser fromcon\n", argv[0]);
-               exit(1);
+               return 1;
+       }
+
+       if (!is_selinux_enabled()) {
+               fprintf(stderr, "%s may be used only on a SELinux enabled kernel.\n", argv[0]);
+               return 4;
        }
 
        rc = getseuserbyname(argv[1], &seuser, &level);
        if (rc) {
-               fprintf(stderr, "getseuserbyname failed:  %s\n",
-                       strerror(errno));
-               exit(2);
+               fprintf(stderr, "getseuserbyname failed:  %s\n", strerror(errno));
+               return 2;
        }
        printf("seuser:  %s, level %s\n", seuser, level);
-       n = get_ordered_context_list_with_level(seuser, level, argv[2],
-                                               &contextlist);
-       if (n <= 0) {
-               fprintf(stderr,
-                       "get_ordered_context_list_with_level failed:  %s\n",
-                       strerror(errno));
-               exit(3);
+
+       rc = security_check_context(argv[2]);
+       if (rc) {
+               fprintf(stderr, "context '%s' is invalid\n", argv[2]);
+               free(seuser);
+               free(level);
+               return 5;
+       }
+
+       n = get_ordered_context_list_with_level(seuser, level, argv[2], &contextlist);
+       if (n < 0) {
+               fprintf(stderr, "get_ordered_context_list_with_level failed:  %s\n", strerror(errno));
+               free(seuser);
+               free(level);
+               return 3;
        }
+
        free(seuser);
        free(level);
-       for (i = 0; i < n; i++)
+
+       if (n == 0)
+               printf("no valid context found\n");
+
+       for (int i = 0; i < n; i++)
                printf("Context %d\t%s\n", i, contextlist[i]);
+
        freeconary(contextlist);
-       exit(EXIT_SUCCESS);
+
+       return EXIT_SUCCESS;
 }
--
Quoted 1 line

2.30.0

Thanks for your patch! Sorry for the delay: I wanted to test things and I have been to busy in the past few days to boot my test machine, and now I see that your patch greatly improves the usability of getseuser! Many thanks!

As an example of the improvement, before (on a non-MLS system):

$ getseuser myadmin system_u:system_r:sshd_t
seuser:  unconfined_u, level (null)
Context 0 unconfined_u:unconfined_r:unconfined_t
$ getseuser myadmin sshd_t
seuser:  unconfined_u, level (null)
get_ordered_context_list:  error in processing configuration file
/etc/selinux/refpolicy-git/contexts/users/unconfined_u
get_ordered_context_list:  error in processing configuration file
/etc/selinux/refpolicy-git/contexts/default_contexts
get_ordered_context_list_with_level failed:  Invalid argument

With your patch, the first command did not change, but the second one now returns:

$ getseuser myadmin sshd_t
seuser:  unconfined_u, level (null)
context 'sshd_t' is invalid

... which is much more helpful, in my humble opinion.

So for both your patches: Acked-by: Nicolas Iooss <[email protected]>

I will merge the 2 patches tomorrow if nobody complains.

Nicolas

#3 lore raw

Re: [PATCH 2/2] libselinux: update getseuser

Quoted 112 lines · Nicolas Iooss
Quoted 82 lines · Christian Göttsche

- Bail out if not running on a SELinux enabled system
- Check whether the passed context is valid
- Do not report a get_ordered_context_list_with_level failure on zero found contexts

---
 libselinux/utils/getseuser.c | 47 +++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 14 deletions(-)
libselinux/utils/getseuser.c +33 -15
index 9193fe0a..ce1b7b27 100644
@@ -9,32 +9,51 @@ int main(int argc, char **argv)
 {
        char *seuser = NULL, *level = NULL;
        char **contextlist;
-       int rc, n, i;
+       int rc, n;
 
        if (argc != 3) {
                fprintf(stderr, "usage:  %s linuxuser fromcon\n", argv[0]);
-               exit(1);
+               return 1;
+       }
+
+       if (!is_selinux_enabled()) {
+               fprintf(stderr, "%s may be used only on a SELinux enabled kernel.\n", argv[0]);
+               return 4;
        }
 
        rc = getseuserbyname(argv[1], &seuser, &level);
        if (rc) {
-               fprintf(stderr, "getseuserbyname failed:  %s\n",
-                       strerror(errno));
-               exit(2);
+               fprintf(stderr, "getseuserbyname failed:  %s\n", strerror(errno));
+               return 2;
        }
        printf("seuser:  %s, level %s\n", seuser, level);
-       n = get_ordered_context_list_with_level(seuser, level, argv[2],
-                                               &contextlist);
-       if (n <= 0) {
-               fprintf(stderr,
-                       "get_ordered_context_list_with_level failed:  %s\n",
-                       strerror(errno));
-               exit(3);
+
+       rc = security_check_context(argv[2]);
+       if (rc) {
+               fprintf(stderr, "context '%s' is invalid\n", argv[2]);
+               free(seuser);
+               free(level);
+               return 5;
+       }
+
+       n = get_ordered_context_list_with_level(seuser, level, argv[2], &contextlist);
+       if (n < 0) {
+               fprintf(stderr, "get_ordered_context_list_with_level failed:  %s\n", strerror(errno));
+               free(seuser);
+               free(level);
+               return 3;
        }
+
        free(seuser);
        free(level);
-       for (i = 0; i < n; i++)
+
+       if (n == 0)
+               printf("no valid context found\n");
+
+       for (int i = 0; i < n; i++)
                printf("Context %d\t%s\n", i, contextlist[i]);
+
        freeconary(contextlist);
-       exit(EXIT_SUCCESS);
+
+       return EXIT_SUCCESS;
 }
--
Quoted 1 line

2.30.0

Thanks for your patch! Sorry for the delay: I wanted to test things and I have been to busy in the past few days to boot my test machine, and now I see that your patch greatly improves the usability of getseuser! Many thanks!

As an example of the improvement, before (on a non-MLS system):

$ getseuser myadmin system_u:system_r:sshd_t
seuser:  unconfined_u, level (null)
Context 0 unconfined_u:unconfined_r:unconfined_t
$ getseuser myadmin sshd_t
seuser:  unconfined_u, level (null)
get_ordered_context_list:  error in processing configuration file
/etc/selinux/refpolicy-git/contexts/users/unconfined_u
get_ordered_context_list:  error in processing configuration file
/etc/selinux/refpolicy-git/contexts/default_contexts
get_ordered_context_list_with_level failed:  Invalid argument

With your patch, the first command did not change, but the second one now returns:

$ getseuser myadmin sshd_t
seuser:  unconfined_u, level (null)
context 'sshd_t' is invalid
Quoted 7 lines

... which is much more helpful, in my humble opinion.

So for both your patches: Acked-by: Nicolas Iooss <[email protected]>

I will merge the 2 patches tomorrow if nobody complains.

Nicolas

Merged. Thanks!
Nicolas