Changeset 6659037 in mainline

Timestamp:

2012-10-14T13:16:14Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

274bbcc7

Parents:

9f4067b6

Message:

libc: Check parameter in pio_enable.

File:

• uspace/lib/c/generic/ddi.c (modified) (2 diffs)

uspace/lib/c/generic/ddi.c

@@ -136 +136 @@
  * @param size     Size of the I/O region.
  * @param virt     Virtual address for application's
- *                 PIO operations.
+ *                 PIO operations. Can be NULL for PMIO.
  *
  * @return EOK on success.
@@ -146 +146 @@
 #ifdef IO_SPACE_BOUNDARY
         if (pio_addr < IO_SPACE_BOUNDARY) {
-                *virt = pio_addr;
+                if (virt)
+                        *virt = pio_addr;
                 return iospace_enable(task_get_id(), pio_addr, size);
         }
 #endif
-        
+        if (!virt)
+                return EINVAL;
+
         void *phys_frame =
             (void *) ALIGN_DOWN((uintptr_t) pio_addr, PAGE_SIZE);