Changeset bd9e868 in mainline

Timestamp:

2018-07-05T16:17:08Z (6 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

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

Children:

acf6b55

Parents:

63d46341

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-05 16:01:00)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-05 16:17:08)

Message:

Fix possible NULL dereferences in async.

File:

• uspace/lib/c/generic/async/client.c (modified) (4 diffs)

uspace/lib/c/generic/async/client.c

@@ -186 +186 @@
 static void amsg_destroy(amsg_t *msg)
 {
+        if (!msg)
+                return;
+
         assert(!msg->destroyed);
         msg->destroyed = true;
@@ -352 +355 @@
 void async_wait_for(aid_t amsgid, errno_t *retval)
 {
-        assert(amsgid);
+        if (amsgid == 0) {
+                if (retval)
+                        *retval = ENOMEM;
+                return;
+        }
 
         amsg_t *msg = (amsg_t *) amsgid;
@@ -397 +404 @@
 errno_t async_wait_timeout(aid_t amsgid, errno_t *retval, suseconds_t timeout)
 {
-        assert(amsgid);
+        if (amsgid == 0) {
+                if (retval)
+                        *retval = ENOMEM;
+                return EOK;
+        }
 
         amsg_t *msg = (amsg_t *) amsgid;
@@ -468 +479 @@
 void async_forget(aid_t amsgid)
 {
+        if (amsgid == 0)
+                return;
+
         amsg_t *msg = (amsg_t *) amsgid;
 
-        assert(msg);
         assert(!msg->forget);
         assert(!msg->destroyed);