util: add new uid_is_valid() call

This simply factors out the uid validation checks from parse_uid() and
uses them everywhere. This simply verifies that the passed UID is
neither 64bit -1 nor 32bit -1.

diff --git a/src/basic/util.c b/src/basic/util.c
index 0d45b631faf222c841fcf64a76ab01f6164b7396..473165f24581fd134d7052891e1a67622522d6eb 100644 (file)
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -373,6 +373,19 @@ int parse_pid(const char *s, pid_t* ret_pid) {
         return 0;
 }
 
         return 0;
 }
 

+bool uid_is_valid(uid_t uid) {
+
+        /* Some libc APIs use UID_INVALID as special placeholder */
+        if (uid == (uid_t) 0xFFFFFFFF)
+                return false;
+
+        /* A long time ago UIDs where 16bit, hence explicitly avoid the 16bit -1 too */
+        if (uid == (uid_t) 0xFFFF)
+                return false;
+
+        return true;
+}
+

 int parse_uid(const char *s, uid_t* ret_uid) {
         unsigned long ul = 0;
         uid_t uid;
 int parse_uid(const char *s, uid_t* ret_uid) {
         unsigned long ul = 0;
         uid_t uid;


@@ -389,12 +402,7 @@ int parse_uid(const char *s, uid_t* ret_uid) {
         if ((unsigned long) uid != ul)
                 return -ERANGE;
 
         if ((unsigned long) uid != ul)
                 return -ERANGE;
 

-        /* Some libc APIs use UID_INVALID as special placeholder */
-        if (uid == (uid_t) 0xFFFFFFFF)
-                return -ENXIO;
-
-        /* A long time ago UIDs where 16bit, hence explicitly avoid the 16bit -1 too */
-        if (uid == (uid_t) 0xFFFF)
+        if (!uid_is_valid(uid))

                 return -ENXIO;
 
         if (ret_uid)
                 return -ENXIO;
 
         if (ret_uid)

diff --git a/src/basic/util.h b/src/basic/util.h
index d7744a7d47d7f26256df4187320d77ea75de42a9..4e5a57324124433e651c007cbee4b0c97dc3eb11 100644 (file)
--- a/src/basic/util.h
+++ b/src/basic/util.h
@@ -154,7 +154,10 @@ int parse_size(const char *t, off_t base, off_t *size);
 int parse_boolean(const char *v) _pure_;
 int parse_pid(const char *s, pid_t* ret_pid);
 int parse_uid(const char *s, uid_t* ret_uid);
 int parse_boolean(const char *v) _pure_;
 int parse_pid(const char *s, pid_t* ret_pid);
 int parse_uid(const char *s, uid_t* ret_uid);

-#define parse_gid(s, ret_uid) parse_uid(s, ret_uid)
+#define parse_gid(s, ret_gid) parse_uid(s, ret_gid)
+
+bool uid_is_valid(uid_t uid);
+#define gid_is_valid(gid) uid_is_valid(gid)

 
 int safe_atou(const char *s, unsigned *ret_u);
 int safe_atoi(const char *s, int *ret_i);
 
 int safe_atou(const char *s, unsigned *ret_u);
 int safe_atoi(const char *s, int *ret_i);

diff --git a/src/libelogind/sd-login/sd-login.c b/src/libelogind/sd-login/sd-login.c
index 7d6a4b78cfeaab2ade669b6080ecd92d0122583f..6300162ebe3703ace2304722f5658011f7636cb6 100644 (file)
--- a/src/libelogind/sd-login/sd-login.c
+++ b/src/libelogind/sd-login/sd-login.c
@@ -203,6 +203,7 @@ _public_ int sd_uid_get_state(uid_t uid, char**state) {
         char *s = NULL;
         int r;
 
         char *s = NULL;
         int r;
 

+        assert_return(uid_is_valid(uid), -EINVAL);

         assert_return(state, -EINVAL);
 
         r = file_of_uid(uid, &p);
         assert_return(state, -EINVAL);
 
         r = file_of_uid(uid, &p);


@@ -230,6 +231,7 @@ _public_ int sd_uid_get_display(uid_t uid, char **session) {
         _cleanup_free_ char *p = NULL, *s = NULL;
         int r;
 
         _cleanup_free_ char *p = NULL, *s = NULL;
         int r;
 

+        assert_return(uid_is_valid(uid), -EINVAL);

         assert_return(session, -EINVAL);
 
         r = file_of_uid(uid, &p);
         assert_return(session, -EINVAL);
 
         r = file_of_uid(uid, &p);


@@ -257,6 +259,7 @@ _public_ int sd_uid_is_on_seat(uid_t uid, int require_active, const char *seat)
         int r;
         const char *word, *variable, *state;
 
         int r;
         const char *word, *variable, *state;
 

+        assert_return(uid_is_valid(uid), -EINVAL);

         assert_return(seat, -EINVAL);
 
         variable = require_active ? "ACTIVE_UID" : "UIDS";
         assert_return(seat, -EINVAL);
 
         variable = require_active ? "ACTIVE_UID" : "UIDS";


@@ -289,6 +292,8 @@ static int uid_get_array(uid_t uid, const char *variable, char ***array) {
         char **a;
         int r;
 
         char **a;
         int r;
 

+        assert_return(uid_is_valid(uid), -EINVAL);
+

         r = file_of_uid(uid, &p);
         if (r < 0)
                 return r;
         r = file_of_uid(uid, &p);
         if (r < 0)
                 return r;