syscall: restart open, ioctl, accept and connect after interrupted

mosmeh · Nov 9, 2024 · 10dbc9d · 10dbc9d
1 parent 561670f
commit 10dbc9d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/kernel/syscall/fs.c b/kernel/syscall/fs.c
@@ -41,6 +41,8 @@ int sys_open(const char* user_pathname, int flags, unsigned mode) {
         return rc;
 
     struct file* file = vfs_open(pathname, flags, (mode & 0777) | S_IFREG);
+    if (PTR_ERR(file) == -EINTR)
+        return -ERESTARTSYS;
     if (IS_ERR(file))
         return PTR_ERR(file);
     rc = task_alloc_file_descriptor(-1, file);
@@ -422,7 +424,10 @@ int sys_ioctl(int fd, int request, void* user_argp) {
     struct file* file = task_get_file(fd);
     if (IS_ERR(file))
         return PTR_ERR(file);
-    return file_ioctl(file, request, user_argp);
+    int rc = file_ioctl(file, request, user_argp);
+    if (rc == -EINTR)
+        return -ERESTARTSYS;
+    return rc;
 }
 
 int sys_mkdir(const char* user_pathname, mode_t mode) {

diff --git a/kernel/syscall/socket.c b/kernel/syscall/socket.c
@@ -99,6 +99,8 @@ int sys_accept4(int sockfd, struct sockaddr* user_addr, socklen_t* user_addrlen,
     }
 
     struct unix_socket* connector = unix_socket_accept(file);
+    if (PTR_ERR(connector) == -EINTR)
+        return -ERESTARTSYS;
     if (IS_ERR(connector))
         return PTR_ERR(connector);
     struct file* connector_file = inode_open(&connector->inode, O_RDWR, 0);
@@ -137,7 +139,10 @@ int sys_connect(int sockfd, const struct sockaddr* user_addr,
     if (IS_ERR(addr_file))
         return PTR_ERR(addr_file);
 
-    return unix_socket_connect(file, addr_file->inode);
+    int rc = unix_socket_connect(file, addr_file->inode);
+    if (rc == -EINTR)
+        return -ERESTARTSYS;
+    return rc;
 }
 
 int sys_shutdown(int sockfd, int how) {