43ff24c
From b374a6f62172bf5352cc1ad825ace44d78430e0c Mon Sep 17 00:00:00 2001
43ff24c
From: Lennart Poettering <lennart@poettering.net>
43ff24c
Date: Wed, 9 Jul 2014 19:21:42 +0200
43ff24c
Subject: [PATCH] sysusers: don't allow control characters in gecos fields
43ff24c
43ff24c
(cherry picked from commit 38c74dad1c3d605018e61074e0b80f6b9523b1c8)
43ff24c
---
43ff24c
 src/sysusers/sysusers.c | 6 +++++-
43ff24c
 1 file changed, 5 insertions(+), 1 deletion(-)
43ff24c
43ff24c
diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
43ff24c
index f3ba8cf7b3..16ea0c9c57 100644
43ff24c
--- a/src/sysusers/sysusers.c
43ff24c
+++ b/src/sysusers/sysusers.c
43ff24c
@@ -1107,7 +1107,11 @@ static bool valid_gecos(const char *d) {
43ff24c
         if (!utf8_is_valid(d))
43ff24c
                 return false;
43ff24c
 
43ff24c
-        if (strpbrk(d, ":\n"))
43ff24c
+        if (string_has_cc(d, NULL))
43ff24c
+                return false;
43ff24c
+
43ff24c
+        /* Colons are used as field separators, and hence not OK */
43ff24c
+        if (strchr(d, ':'))
43ff24c
                 return false;
43ff24c
 
43ff24c
         return true;