Changeset 86d7bfa in mainline

Timestamp:

2011-02-02T20:37:53Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8b5690f, fc47885

Parents:

1e00216

Message:

avoid possible segfaults on error paths when a fibril fails to be created

Location:

uspace

Files:

• drv/test2/test2.c (modified) (1 diff)
• lib/c/generic/async.c (modified) (3 diffs)

uspace/drv/test2/test2.c

@@ -103 +103 @@
         if (dev->parent == NULL) {
                 fid_t postpone = fibril_create(postponed_birth, dev);
+                if (postpone == 0) {
+                        printf(NAME ": fibril_create() error\n");
+                        return ENOMEM;
+                }
                 fibril_add_ready(postpone);
         } else {

uspace/lib/c/generic/async.c

@@ -439 +439 @@
         
         fid_t fid = fibril_create(notification_fibril, msg);
+        if (fid == 0) {
+                free(msg);
+                futex_up(&async_futex);
+                return false;
+        }
+        
         fibril_add_ready(fid);
         
@@ -689 +695 @@
         conn->wdata.fid = fibril_create(connection_fibril, conn);
         
-        if (!conn->wdata.fid) {
+        if (conn->wdata.fid == 0) {
                 free(conn);
+                
                 if (callid)
                         ipc_answer_0(callid, ENOMEM);
+                
                 return (uintptr_t) NULL;
         }
@@ -861 +869 @@
 {
         fid_t fid = fibril_create(async_manager_fibril, NULL);
-        fibril_add_manager(fid);
+        if (fid != 0)
+                fibril_add_manager(fid);
 }