[Pal] Enhance device "dev:tty" checking

Find special devices "dev:tty" by checking `realpath` instead of `fd`. Signed-off-by: Li, Xun <xun.li@intel.com>
gramineproject · Jan 4, 2023 · 07466cb · 07466cb
1 parent be3331f
commit 07466cb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/pal/src/host/linux-sgx/pal_devices.c b/pal/src/host/linux-sgx/pal_devices.c
@@ -116,9 +116,8 @@ static int dev_close(PAL_HANDLE handle) {
     if (handle->hdr.type != PAL_TYPE_DEV)
         return -PAL_ERROR_INVAL;
 
-    /* currently we just assign `0`/`1` FDs without duplicating, so close is a no-op for them */
     int ret = 0;
-    if (handle->dev.fd != PAL_IDX_POISON && handle->dev.fd != 0 && handle->dev.fd != 1) {
+    if (handle->dev.realpath) {
         ret = ocall_close(handle->dev.fd);
     }
     handle->dev.fd = PAL_IDX_POISON;
@@ -175,7 +174,7 @@ static int dev_attrquerybyhdl(PAL_HANDLE handle, PAL_STREAM_ATTR* attr) {
     if (handle->hdr.type != PAL_TYPE_DEV)
         return -PAL_ERROR_INVAL;
 
-    if (handle->dev.fd == 0 || handle->dev.fd == 1) {
+    if (!handle->dev.realpath) {
         /* special case of "dev:tty" device which is the standard input + standard output */
         attr->share_flags  = 0;
         attr->pending_size = 0;

diff --git a/pal/src/host/linux/pal_devices.c b/pal/src/host/linux/pal_devices.c
@@ -114,9 +114,8 @@ static int dev_close(PAL_HANDLE handle) {
     if (handle->hdr.type != PAL_TYPE_DEV)
         return -PAL_ERROR_INVAL;
 
-    /* currently we just assign `0`/`1` FDs without duplicating, so close is a no-op for them */
     int ret = 0;
-    if (handle->dev.fd != PAL_IDX_POISON && handle->dev.fd != 0 && handle->dev.fd != 1) {
+    if (handle->dev.realpath) {
         ret = DO_SYSCALL(close, handle->dev.fd);
     }
     handle->dev.fd = PAL_IDX_POISON;
@@ -165,7 +164,7 @@ static int dev_attrquerybyhdl(PAL_HANDLE handle, PAL_STREAM_ATTR* attr) {
     if (handle->hdr.type != PAL_TYPE_DEV)
         return -PAL_ERROR_INVAL;
 
-    if (handle->dev.fd == 0 || handle->dev.fd == 1) {
+    if (!handle->dev.realpath) {
         /* special case of "dev:tty" device which is the standard input + standard output */
         attr->share_flags  = 0;
         attr->pending_size = 0;