Changeset d7533c7 in mainline

Timestamp:

2011-01-29T18:57:00Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

6119f24

Parents:

0b6931a

Message:

add support for pareas mappable by unprivileged tasks
(currenty, only the clock page has this property)

Location:

kernel

Files:

• arch/arm32/src/mach/gta02/gta02.c (modified) (1 diff)
• arch/arm32/src/mach/integratorcp/integratorcp.c (modified) (1 diff)
• arch/sparc64/src/drivers/niagara.c (modified) (2 diffs)
• generic/include/ddi/ddi.h (modified) (2 diffs)
• generic/src/console/console.c (modified) (1 diff)
• generic/src/ddi/ddi.c (modified) (5 diffs)
• generic/src/lib/rd.c (modified) (1 diff)
• generic/src/time/clock.c (modified) (2 diffs)

kernel/arch/arm32/src/mach/gta02/gta02.c

@@ -174 +174 @@
                 fb_parea.pbase = GTA02_FB_BASE;
                 fb_parea.frames = 150;
+                fb_parea.unpriv = false;
                 ddi_parea_register(&fb_parea);
         }

kernel/arch/arm32/src/mach/integratorcp/integratorcp.c

@@ -300 +300 @@
                 fb_parea.pbase = ICP_FB;
                 fb_parea.frames = 300;
+                fb_parea.unpriv = false;
                 ddi_parea_register(&fb_parea);
         }

kernel/arch/sparc64/src/drivers/niagara.c

@@ -216 +216 @@
         outbuf_parea.pbase = (uintptr_t) (KA2PA(&output_buffer));
         outbuf_parea.frames = 1;
+        outbuf_parea.unpriv = false;
         ddi_parea_register(&outbuf_parea);
 
@@ -221 +222 @@
         inbuf_parea.pbase = (uintptr_t) (KA2PA(&input_buffer));
         inbuf_parea.frames = 1;
+        inbuf_parea.unpriv = false;
         ddi_parea_register(&inbuf_parea);
 

kernel/generic/include/ddi/ddi.h

@@ -43 +43 @@
 /** Structure representing contiguous physical memory area. */
 typedef struct {
-        uintptr_t pbase;    /**< Physical base of the area. */
-        pfn_t frames;       /**< Number of frames in the area. */
+        link_t link;      /**< Linked list link */
         
-        link_t link;        /**< Linked list link */
+        uintptr_t pbase;  /**< Physical base of the area. */
+        pfn_t frames;     /**< Number of frames in the area. */
+        bool unpriv;      /**< Allow mapping by unprivileged tasks. */
 } parea_t;
 
@@ -60 +61 @@
 extern int ddi_iospace_enable_arch(task_t *, uintptr_t, size_t);
 
-
 #endif
 

kernel/generic/src/console/console.c

@@ -160 +160 @@
         klog_parea.pbase = (uintptr_t) faddr;
         klog_parea.frames = SIZE2FRAMES(sizeof(klog));
+        klog_parea.unpriv = false;
         ddi_parea_register(&klog_parea);
         

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;
         

kernel/generic/src/lib/rd.c

@@ -90 +90 @@
             FRAME_SIZE);
         rd_parea.frames = SIZE2FRAMES(dsize);
+        rd_parea.unpriv = false;
         ddi_parea_register(&rd_parea);
 

kernel/generic/src/time/clock.c

@@ -93 +93 @@
         clock_parea.pbase = (uintptr_t) faddr;
         clock_parea.frames = 1;
+        clock_parea.unpriv = true;
         ddi_parea_register(&clock_parea);
         
@@ -100 +101 @@
          *
          */
-        sysinfo_set_item_val("clock.cacheable", NULL, (sysarg_t) true);
         sysinfo_set_item_val("clock.faddr", NULL, (sysarg_t) faddr);
 }