Changeset b5e68c8 in mainline for kernel/generic/src/ddi/ddi.c

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/generic/src/ddi/ddi.c (modified) (7 diffs)

kernel/generic/src/ddi/ddi.c

@@ -104 +104 @@
 {
         ASSERT(TASK);
-        ASSERT((pf % FRAME_SIZE) == 0);
-        ASSERT((vp % PAGE_SIZE) == 0);
-        
-        /*
-         * Make sure the caller is authorised to make this syscall.
-         */
-        cap_t caps = cap_get(TASK);
-        if (!(caps & CAP_MEM_MANAGER))
-                return EPERM;
+        
+        if ((pf % FRAME_SIZE) != 0)
+                return EBADMEM;
+        
+        if ((vp % PAGE_SIZE) != 0)
+                return EBADMEM;
+        
+        /*
+         * Unprivileged tasks are only allowed to map pareas
+         * which are explicitly marked as such.
+         */
+        bool priv =
+            ((cap_get(TASK) & CAP_MEM_MANAGER) == CAP_MEM_MANAGER);
         
         mem_backend_data_t backend_data;
@@ -123 +127 @@
         
         if (znum == (size_t) -1) {
-                /* Frames not found in any zones
-                 * -> assume it is hardware device and allow mapping
+                /*
+                 * Frames not found in any zone
+                 * -> assume it is a hardware device and allow mapping
+                 *    for privileged tasks.
                  */
                 irq_spinlock_unlock(&zones.lock, true);
+                
+                if (!priv)
+                        return EPERM;
+                
                 goto map;
         }
         
         if (zones.info[znum].flags & ZONE_FIRMWARE) {
-                /* Frames are part of firmware */
+                /*
+                 * Frames are part of firmware
+                 * -> allow mapping for privileged tasks.
+                 */
                 irq_spinlock_unlock(&zones.lock, true);
+                
+                if (!priv)
+                        return EPERM;
+                
                 goto map;
         }
@@ -138 +155 @@
         if (zone_flags_available(zones.info[znum].flags)) {
                 /*
-                 * Frames are part of physical memory, check if the memory
-                 * region is enabled for mapping.
+                 * Frames are part of physical memory, check
+                 * if the memory region is enabled for mapping.
                  */
                 irq_spinlock_unlock(&zones.lock, true);
@@ -150 +167 @@
                 if ((!parea) || (parea->frames < pages)) {
                         mutex_unlock(&parea_lock);
-                        goto err;
+                        return ENOENT;
+                }
+                
+                if (!priv) {
+                        if (!parea->unpriv) {
+                                mutex_unlock(&parea_lock);
+                                return EPERM;
+                        }
                 }
                 
@@ -158 +182 @@
         
         irq_spinlock_unlock(&zones.lock, true);
-        
-err:
         return ENOENT;
         
@@ -232 +254 @@
  *
  */
-unative_t sys_physmem_map(unative_t phys_base, unative_t virt_base,
-    unative_t pages, unative_t flags)
-{
-        return (unative_t) ddi_physmem_map(ALIGN_DOWN((uintptr_t) phys_base,
+sysarg_t sys_physmem_map(sysarg_t phys_base, sysarg_t virt_base,
+    sysarg_t pages, sysarg_t flags)
+{
+        return (sysarg_t) ddi_physmem_map(ALIGN_DOWN((uintptr_t) phys_base,
             FRAME_SIZE), ALIGN_DOWN((uintptr_t) virt_base, PAGE_SIZE),
             (size_t) pages, (int) flags);
@@ -247 +269 @@
  *
  */
-unative_t sys_iospace_enable(ddi_ioarg_t *uspace_io_arg)
+sysarg_t sys_iospace_enable(ddi_ioarg_t *uspace_io_arg)
 {
         ddi_ioarg_t arg;
         int rc = copy_from_uspace(&arg, uspace_io_arg, sizeof(ddi_ioarg_t));
         if (rc != 0)
-                return (unative_t) rc;
-        
-        return (unative_t) ddi_iospace_enable((task_id_t) arg.task_id,
+                return (sysarg_t) rc;
+        
+        return (sysarg_t) ddi_iospace_enable((task_id_t) arg.task_id,
             (uintptr_t) arg.ioaddr, (size_t) arg.size);
 }
 
-/** Disable or enable specified interrupts.
- * 
- * @param irq the interrupt to be enabled/disabled.
- * @param enable if true enable the interrupt, disable otherwise.
- * 
- * @retutn Zero on success, error code otherwise.
- */
-unative_t sys_interrupt_enable(int irq, int enable)
-{
-/* FIXME: this needs to be generic code, or better not be in kernel at all. */
-#if 0
-        cap_t task_cap = cap_get(TASK);
-        if (!(task_cap & CAP_IRQ_REG))
-                return EPERM;
-                
-        if (irq < 0 || irq > 16) {
-                return EINVAL;
-        }
-        
-        uint16_t irq_mask = (uint16_t)(1 << irq);
-        if (enable) {
-                trap_virtual_enable_irqs(irq_mask);
-        } else {
-                trap_virtual_disable_irqs(irq_mask);
-        }
-        
-#endif
-        return 0;
-}
-
 /** @}
  */