From da96ffd2384144529a4236c892da07eb261d7089 Mon Sep 17 00:00:00 2001 From: Maxim Zakharov <5158255+Maxime2@users.noreply.github.com> Date: Fri, 8 May 2020 14:58:10 +1000 Subject: TTY_get() in crypto/ui/ui_openssl.c open_console() can also return errno 1 (EPERM, Linux) Signed-off-by: Maxim Zakharov <5158255+Maxime2@users.noreply.github.com> Reviewed-by: Tomas Mraz Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/11767) (cherry picked from commit 082394839ea32386abc7ee33aaa9da864287064c) --- crypto/ui/ui_openssl.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'crypto/ui') diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c index 168de4630d..6830bd25c2 100644 --- a/crypto/ui/ui_openssl.c +++ b/crypto/ui/ui_openssl.c @@ -439,6 +439,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), -- cgit v1.2.3