Changeset 545 for trunk/kernel/kern/chdev.c

Timestamp:

Sep 21, 2018, 10:23:06 PM (6 years ago)

Author:

nicolas.van.phan@…

Message:

Fix memory access at 0x10 and 0x14

chdev_dir() tried to read chdev_dir.iob to display information
about the IOB, but on TSAR LETI there's no IOB and this pointer
is NULL.

File:

• trunk/kernel/kern/chdev.c (modified) (1 diff)

trunk/kernel/kern/chdev.c

@@ -456 +456 @@
 
     // IOB
-    cxy  = GET_CXY( chdev_dir.iob );
-    ptr  = GET_PTR( chdev_dir.iob );
-    base = (uint32_t)hal_remote_lwd( XPTR( cxy , &ptr->base ) );
-    nolock_printk("  - iob       : cxy = %X / ptr = %X / base = %X\n", cxy, ptr, base);
+    if (chdev_dir.iob != NULL )
+    {
+        cxy  = GET_CXY( chdev_dir.iob );
+        ptr  = GET_PTR( chdev_dir.iob );
+        base = (uint32_t)hal_remote_lwd( XPTR( cxy , &ptr->base ) );
+        nolock_printk("  - iob       : cxy = %X / ptr = %X / base = %X\n", cxy, ptr, base);
+    }
 
     // PIC