From f26867928c451443769fecc41c3283e077e8c49f Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 22 Feb 2016 10:56:27 +0100 Subject: g13: Run mount after dmsetup. * g13/g13-syshelp.c (main): Reject userids with a slash. * g13/sh-dmcrypt.c (sh_dmcrypt_mount_container): Run mount if a mountpoint is known. Signed-off-by: Werner Koch --- g13/g13-syshelp.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) (limited to 'g13/g13-syshelp.c') diff --git a/g13/g13-syshelp.c b/g13/g13-syshelp.c index b31964e6e..645730fc6 100644 --- a/g13/g13-syshelp.c +++ b/g13/g13-syshelp.c @@ -512,15 +512,23 @@ main ( int argc, char **argv) ctrl.client.uid = (uid_t)myuid; } - pwd = getpwuid (ctrl.client.uid); - if (!pwd || !*pwd->pw_name) - { - log_info ("WARNING: Name for UID not found: %s\n", strerror (errno)); - ctrl.fail_all_cmds = 1; - ctrl.client.uname = xstrdup ("?"); - } - else - ctrl.client.uname = xstrdup (pwd->pw_name); + pwd = getpwuid (ctrl.client.uid); + if (!pwd || !*pwd->pw_name) + { + log_info ("WARNING: Name for UID not found: %s\n", strerror (errno)); + ctrl.fail_all_cmds = 1; + ctrl.client.uname = xstrdup ("?"); + } + else + ctrl.client.uname = xstrdup (pwd->pw_name); + + /* Check that the user name does not contain a directory + separator. */ + if (strchr (ctrl.client.uname, '/')) + { + log_info ("WARNING: Invalid user name passed\n"); + ctrl.fail_all_cmds = 1; + } } #else /*!HAVE_PWD_H || !HAVE_GETPWUID*/ log_info ("WARNING: System does not support required syscalls\n"); -- cgit v1.2.3