]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
TTY_get() in crypto/ui/ui_openssl.c open_console() can also return errno 1 (EPERM...
authorMaxim Zakharov <5158255+Maxime2@users.noreply.github.com>
Fri, 8 May 2020 04:58:10 +0000 (14:58 +1000)
committerMatt Caswell <matt@openssl.org>
Mon, 18 May 2020 08:56:27 +0000 (09:56 +0100)
Signed-off-by: Maxim Zakharov <5158255+Maxime2@users.noreply.github.com>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11767)

crypto/ui/ui_openssl.c

index cf873431f7a014a6d5fe464f707cb8874328174c..e41a719e65ef6119da2a630c2eb3e34940cec691 100644 (file)
@@ -435,6 +435,16 @@ static int open_console(UI *ui)
             is_a_tty = 0;
         else
 #  endif
+#  ifdef EPERM
+            /*
+             * Linux can return EPERM (Operation not permitted),
+             * e.g. if a daemon executes openssl via fork()+execve()
+             * This should be ok
+             */
+        if (errno == EPERM)
+            is_a_tty = 0;
+        else
+#  endif
 #  ifdef ENODEV
             /*
              * MacOS X returns ENODEV (Operation not supported by device),